X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/08fec0be398954b85575af913448efa8a2e34d19..6bb245ae4f93f3657aa56dfe4ca08d94ddce7723:/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 93fd221..80dc5ff 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -5,6 +5,7 @@ import java.io.OutputStream;
 import java.io.File;
 import java.io.FileReader;
 import java.io.BufferedReader;
+import java.io.DataOutputStream;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -13,16 +14,25 @@ public class DebounceModuleHelper
 {
 	private Context ctx;
 	public static final String PREFS_NAME = "DebounceCfg";
+	final int SUPERUSER_REQUEST = 4223;
 
 	public DebounceModuleHelper(Context context) {
 		ctx = context;
 	}
 
 	public void loadModule() {
-		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		loadModule(getSavedDelay());
+	}
 
-		int delay = settings.getInt("debounce_delay", 10);
-		loadModule(delay);
+	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();
+
+		rootcmd.waitFor();
 	}
 
 	public synchronized void loadModule(int delay) {
@@ -30,32 +40,35 @@ public class DebounceModuleHelper
 
 		extractModule();
 
-		// FIXME: Read settings from database...
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
+		if (is_safe_to_load()) {
+			editor.putBoolean("safe_to_load", false);
+			editor.commit();
+		}
 
 		try {
-			Process insmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay});
-			insmod.waitFor();
+			runAsRoot("/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay);
 		} catch (Exception e) {
 			return;
 		}
-	
+
+		if (!isLoaded()) {
+			return;
+		}
+
 		if (getDelay() <= 0) {
 			return;
 		}
 
 		/* Module was obviously loaded, so it is safe to load on boot */
-		if (!is_safe_to_load()) {
-			SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-			SharedPreferences.Editor editor = settings.edit();
-			editor.putBoolean("safe_to_load", true);
-			editor.commit();
-		}
+		editor.putBoolean("safe_to_load", true);
+		editor.commit();
 	}
 
 	public synchronized void unloadModule() {
 		try {
-			Process rmmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/rmmod debounce"});
-			rmmod.waitFor();
+			runAsRoot("/system/bin/rmmod debounce");
 		} catch (Exception e) {}
 	}
 
@@ -98,11 +111,48 @@ public class DebounceModuleHelper
 		return debounce_delay;
 	}
 
+	public synchronized void setDelay(int delay) {
+		if (isLoaded()) {
+			if (getDelay() == delay) {
+				return;
+			}
+
+			unloadModule();
+		}
+
+		loadModule(delay);
+	}
+
+	public synchronized int getSavedDelay() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+		return settings.getInt("debounce_delay", 10);
+	}
+
+	public synchronized void setSavedDelay(int delay) {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
+
+		editor.putInt("debounce_delay", delay);
+		editor.commit();
+	}
+
 	public synchronized boolean is_safe_to_load() {
 		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-		boolean safe_to_load = settings.getBoolean("safe_to_load", false);
+		return settings.getBoolean("safe_to_load", false);
+	}
+
+	public synchronized boolean get_on_boot() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		return settings.getBoolean("on_boot", false);
+	}
+
+	public synchronized void set_on_boot(boolean on_boot) {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
 
-		return safe_to_load;
+		editor.putBoolean("on_boot", on_boot);
+		editor.commit();
 	}
 
 	private synchronized void extractModule() {