X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/a7c1cd77598c83fe14577cb0393e76ee7d29645c..2b26b706ee901d201d424c5e6386649f5fb16636:/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java?ds=sidebyside

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index b5310d6..b01b2b5 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -32,7 +32,7 @@ public class DebounceModuleHelper
 		setActiveHigh(getSavedActiveHigh());
 	}
 
-	public boolean loadModule() {
+	public boolean loadModule() throws NotRootedException,ShellException {
 		if (!_loadModule())
 			return false;
 
@@ -41,21 +41,48 @@ public class DebounceModuleHelper
 		return true;
 	}
 
-	protected void runAsRoot(String command) throws java.io.IOException,java.lang.InterruptedException {
-		Process rootcmd = Runtime.getRuntime().exec(new String[]{"su","-c","sh"});
-		DataOutputStream sh = new DataOutputStream(rootcmd.getOutputStream());
-		sh.writeBytes(command + "\n");
-		sh.writeBytes("exit\n");
-		sh.flush();
-		sh.close();
+	protected void runAsRoot(String command) throws NotRootedException,ShellException {
+		Process rootcmd;
 
-		rootcmd.waitFor();
+		try {
+			rootcmd = Runtime.getRuntime().exec(new String[]{"su","-c","sh"});
+		} catch (java.io.IOException e) {
+			throw new NotRootedException();
+		}
+
+		try {
+			DataOutputStream sh = new DataOutputStream(rootcmd.getOutputStream());
+			sh.writeBytes(command + "\n");
+			sh.writeBytes("exit\n");
+			sh.flush();
+			sh.close();
+		} catch (java.io.IOException e) {
+			throw new ShellException();
+		}
+
+		try {
+			if (rootcmd.waitFor() != 0)
+				throw new ShellException();
+		} catch (java.lang.InterruptedException e) {
+			throw new ShellException();
+		}
 	}
 
-	public synchronized boolean _loadModule() {
-		File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
+	public synchronized boolean _loadModule() throws NotRootedException,ShellException {
+		File insmod = new File("/system/bin/insmod");
+		if (!insmod.exists()) {
+			insmod = new File("/system/xbin/insmod");
+			if (!insmod.exists()) {
+				return false;
+			}
+		}
 
-		extractModule();
+		File debounce_ko = new File("/system/lib/modules/debounce.ko");
+		if (!debounce_ko.exists()) {
+			debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
+
+			extractModule();
+		}
 
 		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 		SharedPreferences.Editor editor = settings.edit();
@@ -64,10 +91,16 @@ public class DebounceModuleHelper
 			editor.commit();
 		}
 
-		try {
-			runAsRoot("/system/bin/insmod " + debounce_ko + " || /system/xbin/insmod " + debounce_ko);
-		} catch (Exception e) {
-			return false;
+		runAsRoot(insmod + " " + debounce_ko);
+
+		int cnt = 10;
+		while ((!isLoaded()) && (cnt > 0)) {
+			try {
+				Thread.sleep(100);
+			} catch (Exception e) {
+				return false;
+			}
+			cnt--;
 		}
 
 		if (!isLoaded()) {
@@ -85,18 +118,22 @@ public class DebounceModuleHelper
 		return true;
 	}
 
-	public synchronized boolean unloadModule() {
-		try {
-			runAsRoot("/system/bin/rmmod debounce || /system/xbin/rmmod debounce");
-		} catch (Exception e) {
-			return false;
+	public synchronized void unloadModule() throws NotRootedException,ShellException {
+		File rmmod = new File("/system/bin/rmmod");
+
+		if (!rmmod.exists()) {
+			rmmod = new File("/system/xbin/rmmod");
+			if (!rmmod.exists()) {
+				return;
+			}
 		}
 
-		return true;
+		runAsRoot(rmmod + " debounce");
 	}
 
 	public synchronized boolean isLoaded() {
 		boolean loaded = false;
+
 		try {
 			String read;
 
@@ -105,10 +142,13 @@ public class DebounceModuleHelper
 
 			while((read = modules_buf.readLine()) != null) {
 				if (read.regionMatches(0, "debounce", 0, 8)) {
-					loaded = true;
+					File sysdir = new File("/sys/devices/debounce");
+					if (sysdir.exists() && sysdir.isDirectory()) {
+						loaded = true;
+						break;
+					}
 				}
 			}
-
 		} catch (Exception e) {
 			loaded = false;
 		}
@@ -148,8 +188,7 @@ public class DebounceModuleHelper
 			fbuf.write((new Integer(value)).toString());
 
 			fbuf.close();
-		} catch (Exception e) {
-		}
+		} catch (Exception e) {}
 	}
 
 	public synchronized int getDelay() {