X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/0c4d887cedf2d981df24dcf7716b283be10e64e6..f2b5155d2d9182c8f84d481ca73702b0b6d9c3d9:/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index 2ee5501..56698dc 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -11,6 +11,7 @@ import java.io.DataOutputStream;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.util.Log;
 
 public class DebounceModuleHelper
 {
@@ -18,6 +19,8 @@ public class DebounceModuleHelper
 	public static final String PREFS_NAME = "DebounceCfg";
 	final int SUPERUSER_REQUEST = 4223;
 
+	private static final String TAG = "DebounceModuleHelper";
+
 	public DebounceModuleHelper(Context context) {
 		ctx = context;
 	}
@@ -44,9 +47,11 @@ public class DebounceModuleHelper
 	protected void runAsRoot(String command) throws NotRootedException,ShellException {
 		Process rootcmd;
 
+		Log.i(TAG, "Running as root: " + command);
 		try {
 			rootcmd = Runtime.getRuntime().exec(new String[]{"su","-c","sh"});
 		} catch (java.io.IOException e) {
+			Log.e(TAG, "Got IOException: " + e.getMessage() + " (" + e.getCause() + ")");
 			throw new NotRootedException();
 		}
 
@@ -57,21 +62,48 @@ public class DebounceModuleHelper
 			sh.flush();
 			sh.close();
 		} catch (java.io.IOException e) {
+			Log.e(TAG, "Got IOException: " + e.getMessage() + " (" + e.getCause() + ")");
 			throw new ShellException();
 		}
 
 		try {
-			if (rootcmd.waitFor() != 0)
+			int r = rootcmd.waitFor();
+
+			if (r != 0) {
+				Log.e(TAG, "Process returned: " + r);
 				throw new ShellException();
+			}
 		} catch (java.lang.InterruptedException e) {
+			Log.e(TAG, "Got InterruptedException: " + e.getMessage() + " (" + e.getCause() + ")");
 			throw new ShellException();
 		}
+
+		Log.i(TAG, "Process executed successfully");
 	}
 
 	public synchronized boolean _loadModule() throws NotRootedException,ShellException {
-		File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
+		Log.i(TAG, "Loading module");
+
+		if (isLoaded()) {
+			Log.i(TAG, "Module already loaded");
+			return true;
+		}
+
+		File insmod = new File("/system/bin/insmod");
+		if (!insmod.exists()) {
+			insmod = new File("/system/xbin/insmod");
+			if (!insmod.exists()) {
+				Log.e(TAG, "insmod not found");
+				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();
@@ -80,9 +112,21 @@ public class DebounceModuleHelper
 			editor.commit();
 		}
 
-		runAsRoot("/system/bin/insmod " + debounce_ko + " || /system/xbin/insmod " + debounce_ko);
+		runAsRoot(insmod + " " + debounce_ko);
+
+		int cnt = 10;
+		while ((!isLoaded()) && (cnt > 0)) {
+			try {
+				Thread.sleep(100);
+			} catch (Exception e) {
+				Log.e(TAG, "Got Exception: " + e.getMessage() + " (" + e.getCause() + ")");
+				return false;
+			}
+			cnt--;
+		}
 
 		if (!isLoaded()) {
+			Log.e(TAG, "Module doesn't appear to be correctly loaded");
 			return false;
 		}
 
@@ -94,15 +138,34 @@ public class DebounceModuleHelper
 		editor.putBoolean("safe_to_load", true);
 		editor.commit();
 
+		Log.i(TAG, "Module loaded successfully");
 		return true;
 	}
 
 	public synchronized void unloadModule() throws NotRootedException,ShellException {
-		runAsRoot("/system/bin/rmmod debounce || /system/xbin/rmmod debounce");
+		Log.i(TAG, "Unloading module");
+
+		if (!isLoaded()) {
+			Log.i(TAG, "Module not loaded");
+			return;
+		}
+
+		File rmmod = new File("/system/bin/rmmod");
+
+		if (!rmmod.exists()) {
+			rmmod = new File("/system/xbin/rmmod");
+			if (!rmmod.exists()) {
+				Log.e(TAG, "rmmod not found");
+				return;
+			}
+		}
+
+		runAsRoot(rmmod + " debounce");
 	}
 
 	public synchronized boolean isLoaded() {
 		boolean loaded = false;
+
 		try {
 			String read;
 
@@ -111,10 +174,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;
 		}