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 6a46fbb3e6ebd3a46866a75d73c5495cea6a3f76..2ee55014884806f3637cc82527a6d0415015cd5d 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -26,25 +26,49 @@ public class DebounceModuleHelper
                setDelay(getSavedDelay());
                setSettle(getSavedSettle());
                setPoll(getSavedPoll());
                setDelay(getSavedDelay());
                setSettle(getSavedSettle());
                setPoll(getSavedPoll());

+               setHwDebounce(getSavedHwDebounce());
+               setHwDebounceTime(getSavedHwDebounceTime());
+               //setDriveInactive(getSavedDriveInactive());
+               setActiveHigh(getSavedActiveHigh());

        }
 
        }
 

-       public void loadModule() {
-               _loadModule();
+       public boolean loadModule() throws NotRootedException,ShellException {
+               if (!_loadModule())
+                       return false;
+

                setAllValues();
                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;
+
+               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();
+               }

 
 

-               rootcmd.waitFor();
+               try {
+                       if (rootcmd.waitFor() != 0)
+                               throw new ShellException();
+               } catch (java.lang.InterruptedException e) {
+                       throw new ShellException();
+               }

        }
 
        }
 

-       public synchronized void _loadModule() {
+       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();


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

-               try {
-                       runAsRoot("/system/bin/insmod " + debounce_ko);
-               } 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) {
                }
 
                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();
                }
 
                /* 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 {
-                       runAsRoot("/system/bin/rmmod debounce");
-               } 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() {


@@ -161,10 +181,60 @@ public class DebounceModuleHelper
                setValue("poll_time", 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);
 
        public synchronized int getSavedDelay() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 

-               return settings.getInt("debounce_delay", 8);
+               return settings.getInt("debounce_delay", 15);

        }
 
        public synchronized void setSavedDelay(int delay) {
        }
 
        public synchronized void setSavedDelay(int delay) {


@@ -178,7 +248,7 @@ public class DebounceModuleHelper
        public synchronized int getSavedSettle() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
        public synchronized int getSavedSettle() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 

-               return settings.getInt("settle_time", 100);
+               return settings.getInt("settle_time", 40);

        }
 
        public synchronized void setSavedSettle(int settle) {
        }
 
        public synchronized void setSavedSettle(int settle) {


@@ -192,7 +262,7 @@ public class DebounceModuleHelper
        public synchronized int getSavedPoll() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
        public synchronized int getSavedPoll() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 

-               return settings.getInt("poll_time", 10);
+               return settings.getInt("poll_time", 20);

        }
 
        public synchronized void setSavedPoll(int poll) {
        }
 
        public synchronized void setSavedPoll(int poll) {


@@ -203,6 +273,62 @@ public class DebounceModuleHelper
                editor.commit();
        }
 
                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);
                return settings.getBoolean("safe_to_load", false);
        public synchronized boolean is_safe_to_load() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
                return settings.getBoolean("safe_to_load", false);