X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/1786d1916425cb53b022b5c3179c896b98a31a41..6bc2dff565d5cec6ae19a6dfe3f14dab179a3d6d:/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java?ds=inline

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index 6234eae..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;
 	}
@@ -32,26 +35,75 @@ public class DebounceModuleHelper
 		setActiveHigh(getSavedActiveHigh());
 	}
 
-	public void loadModule() {
-		_loadModule();
+	public boolean loadModule() throws NotRootedException,ShellException {
+		if (!_loadModule())
+			return false;
+
 		setAllValues();
+
+		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;
+
+		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();
+		}
+
+		try {
+			DataOutputStream sh = new DataOutputStream(rootcmd.getOutputStream());
+			sh.writeBytes(command + "\n");
+			sh.writeBytes("exit\n");
+			sh.flush();
+			sh.close();
+		} catch (java.io.IOException e) {
+			Log.e(TAG, "Got IOException: " + e.getMessage() + " (" + e.getCause() + ")");
+			throw new ShellException();
+		}
+
+		try {
+			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();
+		}
 
-		rootcmd.waitFor();
+		Log.i(TAG, "Process executed successfully");
 	}
 
-	public synchronized void _loadModule() {
-		File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
+	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;
+			}
+		}
+
+		File debounce_ko = new File("/system/lib/modules/debounce.ko");
+		if (!debounce_ko.exists()) {
+			debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
-		extractModule();
+			extractModule();
+		}
 
 		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 		SharedPreferences.Editor editor = settings.edit();
@@ -60,33 +112,60 @@ public class DebounceModuleHelper
 			editor.commit();
 		}
 
-		try {
-			runAsRoot("/system/bin/insmod " + debounce_ko);
-		} catch (Exception e) {
-			return;
+		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()) {
-			return;
+			Log.e(TAG, "Module doesn't appear to be correctly loaded");
+			return false;
 		}
 
 		if (getDelay() < 0) {
-			return;
+			return false;
 		}
 
 		/* Module was obviously loaded, so it is safe to load on boot */
 		editor.putBoolean("safe_to_load", true);
 		editor.commit();
+
+		Log.i(TAG, "Module loaded successfully");
+		return true;
 	}
 
-	public synchronized void unloadModule() {
-		try {
-			runAsRoot("/system/bin/rmmod debounce");
-		} catch (Exception e) {}
+	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;
+			}
+		}
+
+		runAsRoot(rmmod + " debounce");
 	}
 
 	public synchronized boolean isLoaded() {
 		boolean loaded = false;
+
 		try {
 			String read;
 
@@ -95,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;
 		}