better interaction with superuser

[ms2-fixes] / 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 6901353f9893a153268fa9b96e61908108ba54a7..80dc5ff134745fabb87e4ac221252d180ff7da73 100644 (file)
--- 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.File;
 import java.io.FileReader;
 import java.io.BufferedReader;

+import java.io.DataOutputStream;

 
 import android.content.Context;
 import android.content.SharedPreferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;


@@ -13,6 +14,7 @@ public class DebounceModuleHelper
 {
        private Context ctx;
        public static final String PREFS_NAME = "DebounceCfg";
 {
        private Context ctx;
        public static final String PREFS_NAME = "DebounceCfg";

+       final int SUPERUSER_REQUEST = 4223;

 
        public DebounceModuleHelper(Context context) {
                ctx = context;
 
        public DebounceModuleHelper(Context context) {
                ctx = context;


@@ -22,6 +24,17 @@ public class DebounceModuleHelper
                loadModule(getSavedDelay());
        }
 
                loadModule(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();
+
+               rootcmd.waitFor();
+       }
+

        public synchronized void loadModule(int delay) {
                File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
        public synchronized void loadModule(int delay) {
                File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 


@@ -35,8 +48,7 @@ public class DebounceModuleHelper
                }
 
                try {
                }
 
                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;
                }
                } catch (Exception e) {
                        return;
                }


@@ -56,8 +68,7 @@ public class DebounceModuleHelper
 
        public synchronized void unloadModule() {
                try {
 
        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) {}
        }
 
                } catch (Exception e) {}
        }
 


@@ -128,9 +139,20 @@ public class DebounceModuleHelper
 
        public synchronized boolean is_safe_to_load() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
        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);
+       }

 
 

-               return safe_to_load;
+       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();
+
+               editor.putBoolean("on_boot", on_boot);
+               editor.commit();

        }
 
        private synchronized void extractModule() {
        }
 
        private synchronized void extractModule() {