X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/2b26b706ee901d201d424c5e6386649f5fb16636..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 b01b2b5..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,22 +62,38 @@ 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 {
+		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;
 			}
 		}
@@ -98,12 +119,14 @@ public class DebounceModuleHelper
 			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;
 		}
 
@@ -115,15 +138,24 @@ 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 {
+		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;
 			}
 		}