better error-handling when executing commands as root

[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 75607b819bcdf2524eb240ed24175301d9232133..2ee55014884806f3637cc82527a6d0415015cd5d 100644 (file)
--- 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.OutputStream;
 import java.io.File;
 import java.io.FileReader;

+import java.io.FileWriter;

 import java.io.BufferedReader;
 import java.io.BufferedReader;

+import java.io.BufferedWriter;
+import java.io.DataOutputStream;

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


@@ -13,19 +16,59 @@ 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;
        }
 

-       public void loadModule() {
-               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+       public void setAllValues() {
+               setDelay(getSavedDelay());
+               setSettle(getSavedSettle());
+               setPoll(getSavedPoll());
+               setHwDebounce(getSavedHwDebounce());
+               setHwDebounceTime(getSavedHwDebounceTime());
+               //setDriveInactive(getSavedDriveInactive());
+               setActiveHigh(getSavedActiveHigh());
+       }
+
+       public boolean loadModule() throws NotRootedException,ShellException {
+               if (!_loadModule())
+                       return false;

 
 

-               int delay = settings.getInt("debounce_delay", 10);
-               loadModule(delay);
+               setAllValues();
+
+               return true;

        }
 
        }
 

-       public synchronized void loadModule(int delay) {
+       protected void runAsRoot(String command) throws NotRootedException,ShellException {
+               Process rootcmd;
+
+               try {
+                       rootcmd = Runtime.getRuntime().exec(new String[]{"su","-c","sh"});
+               } catch (java.io.IOException e) {
+                       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) {
+                       throw new ShellException();
+               }
+
+               try {
+                       if (rootcmd.waitFor() != 0)
+                               throw new ShellException();
+               } catch (java.lang.InterruptedException e) {
+                       throw new ShellException();
+               }
+       }
+
+       public synchronized boolean _loadModule() throws NotRootedException,ShellException {

                File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
                extractModule();
                File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
                extractModule();


@@ -37,31 +80,25 @@ public class DebounceModuleHelper
                        editor.commit();
                }
 
                        editor.commit();
                }
 

-               try {
-                       Process insmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay});
-                       insmod.waitFor();
-               } catch (Exception e) {
-                       return;
-               }
+               runAsRoot("/system/bin/insmod " + debounce_ko + " || /system/xbin/insmod " + debounce_ko);

 
                if (!isLoaded()) {
 
                if (!isLoaded()) {

-                       return;
+                       return false;

                }
                }

-       
-               if (getDelay() <= 0) {
-                       return;
+
+               if (getDelay() < 0) {
+                       return false;

                }
 
                /* Module was obviously loaded, so it is safe to load on boot */
                editor.putBoolean("safe_to_load", true);
                editor.commit();
                }
 
                /* Module was obviously loaded, so it is safe to load on boot */
                editor.putBoolean("safe_to_load", true);
                editor.commit();

+
+               return true;

        }
 
        }
 

-       public synchronized void unloadModule() {
-               try {
-                       Process rmmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/rmmod debounce"});
-                       rmmod.waitFor();
-               } catch (Exception e) {}
+       public synchronized void unloadModule() throws NotRootedException,ShellException {
+               runAsRoot("/system/bin/rmmod debounce || /system/xbin/rmmod debounce");

        }
 
        public synchronized boolean isLoaded() {
        }
 
        public synchronized boolean isLoaded() {


@@ -85,29 +122,229 @@ public class DebounceModuleHelper
                return loaded;
        }
 
                return loaded;
        }
 

-       public synchronized int getDelay() {
-               int debounce_delay = -1;
+       private synchronized int getValue(String parameter) {
+               int value = -1;

 
                try {
                        String read;
 
 
                try {
                        String read;
 

-                       FileReader delay = new FileReader("/sys/module/debounce/parameters/debounce_delay");
-                       BufferedReader delay_buf = new BufferedReader(delay);
+                       FileReader fr = new FileReader("/sys/devices/debounce/" + parameter);
+                       BufferedReader fbuf = new BufferedReader(fr);

 
 

-                       read = delay_buf.readLine();
+                       read = fbuf.readLine();

                        if (read != null) {
                        if (read != null) {

-                               debounce_delay = Integer.parseInt(read.trim());
+                               value = Integer.parseInt(read.trim());

                        }
                        }

+
+                       fbuf.close();
+               } catch (Exception e) {}
+
+               return value;
+       }
+
+       private synchronized void setValue(String parameter, int value) {
+               if (!isLoaded()) {
+                       return;
+               }
+
+               try {
+                       FileWriter fw = new FileWriter("/sys/devices/debounce/" + parameter);
+                       BufferedWriter fbuf = new BufferedWriter(fw);
+
+                       fbuf.write((new Integer(value)).toString());
+
+                       fbuf.close();

                } catch (Exception e) {}
                } catch (Exception e) {}

+       }
+
+       public synchronized int getDelay() {
+               return getValue("debounce_delay");
+       }

 
 

-               return debounce_delay;
+       public synchronized void setDelay(int debounce_delay) {
+               setValue("debounce_delay", debounce_delay);
+       }
+
+       public synchronized int getSettle() {
+               return getValue("settle_time");
+       }
+
+       public synchronized void setSettle(int settle_time) {
+               setValue("settle_time", settle_time);
+       }
+
+       public synchronized int getPoll() {
+               return getValue("poll_time");
+       }
+
+       public synchronized void setPoll(int poll_time) {
+               setValue("poll_time", poll_time);
+       }
+
+       public synchronized boolean getHwDebounce() {
+               if (getValue("hw_debounce") == 1)
+                       return true;
+
+               return false;
+       }
+
+       public synchronized void setHwDebounce(boolean enable) {
+               if (enable)
+                       setValue("hw_debounce", 1);
+               else
+                       setValue("hw_debounce", 0);
+       }
+
+       public synchronized int getHwDebounceTime() {
+               return getValue("hw_debounce_time");
+       }
+
+       public synchronized void setHwDebounceTime(int time) {
+               setValue("hw_debounce_time", time);
+       }
+
+       public synchronized boolean getDriveInactive() {
+               if (getValue("drive_inactive_flag") == 1)
+                       return true;
+
+               return false;
+       }
+
+       public synchronized void setDriveInactive(boolean enable) {
+               if (enable)
+                       setValue("drive_inactive_flag", 1);
+               else
+                       setValue("drive_inactive_flag", 0);
+       }
+
+       public synchronized boolean getActiveHigh() {
+               if (getValue("active_high_flag") == 1)
+                       return true;
+
+               return false;
+       }
+
+       public synchronized void setActiveHigh(boolean enable) {
+               if (enable)
+                       setValue("active_high_flag", 1);
+               else
+                       setValue("active_high_flag", 0);
+       }
+
+       public synchronized int getSavedDelay() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getInt("debounce_delay", 15);
+       }
+
+       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 int getSavedSettle() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getInt("settle_time", 40);
+       }
+
+       public synchronized void setSavedSettle(int settle) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putInt("settle_time", settle);
+               editor.commit();
+       }
+
+       public synchronized int getSavedPoll() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getInt("poll_time", 20);
+       }
+
+       public synchronized void setSavedPoll(int poll) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putInt("poll_time", poll);
+               editor.commit();
+       }
+
+       public synchronized boolean getSavedHwDebounce() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getBoolean("hw_debounce", false);
+       }
+
+       public synchronized void setSavedHwDebounce(boolean enable) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putBoolean("hw_debounce", enable);
+               editor.commit();
+       }
+
+       public synchronized int getSavedHwDebounceTime() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getInt("hw_debounce_time", 1);
+       }
+
+       public synchronized void setSavedHwDebounceTime(int time) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putInt("hw_debounce_time", time);
+               editor.commit();
+       }
+
+       public synchronized boolean getSavedDriveInactive() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getBoolean("drive_inactive", false);
+       }
+
+       public synchronized void setSavedDriveInactive(boolean enable) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putBoolean("drive_inactive", enable);
+               editor.commit();
+       }
+
+       public synchronized boolean getSavedActiveHigh() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getBoolean("active_high", false);
+       }
+
+       public synchronized void setSavedActiveHigh(boolean enable) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putBoolean("active_high", enable);
+               editor.commit();

        }
 
        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);
+       }
+
+       public synchronized boolean get_on_boot() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               return settings.getBoolean("on_boot", false);
+       }

 
 

-               return safe_to_load;
+       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() {