X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/08fec0be398954b85575af913448efa8a2e34d19..0b9d6422126cbd641917c648172f890e2ca72c6f:/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..5e2a476 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -4,7 +4,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.File;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.DataOutputStream;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -13,49 +16,62 @@ 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();
+		setDelay(getSavedDelay());
+	}
+
+	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();
 
-		int delay = settings.getInt("debounce_delay", 10);
-		loadModule(delay);
+		rootcmd.waitFor();
 	}
 
-	public synchronized void loadModule(int delay) {
+	public synchronized void _loadModule() {
 		File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
 		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);
 		} catch (Exception e) {
 			return;
 		}
-	
-		if (getDelay() <= 0) {
+
+		if (!isLoaded()) {
 			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();
+		if (getDelay() < 0) {
+			return;
 		}
+
+		/* Module was obviously loaded, so it is safe to load on boot */
+		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) {}
 	}
 
@@ -86,23 +102,65 @@ public class DebounceModuleHelper
 		try {
 			String read;
 
-			FileReader delay = new FileReader("/sys/module/debounce/parameters/debounce_delay");
+			FileReader delay = new FileReader("/sys/devices/debounce/debounce_delay");
 			BufferedReader delay_buf = new BufferedReader(delay);
 
 			read = delay_buf.readLine();
 			if (read != null) {
 				debounce_delay = Integer.parseInt(read.trim());
 			}
+
+			delay_buf.close();
 		} catch (Exception e) {}
 
 		return debounce_delay;
 	}
 
+	public synchronized void setDelay(int debounce_delay) {
+		if (!isLoaded()) {
+			return;
+		}
+
+		try {
+			FileWriter delay = new FileWriter("/sys/devices/debounce/debounce_delay");
+			BufferedWriter delay_buf = new BufferedWriter(delay);
+
+			delay_buf.write((new Integer(debounce_delay)).toString());
+
+			delay_buf.close();
+		} catch (Exception e) {}
+	}
+
+	public synchronized int getSavedDelay() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+		return settings.getInt("debounce_delay", 8);
+	}
+
+	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() {