error checks, manifest updates to limit market devices

[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 bbe972e30bcd7561ec674687f3e85fe4a1435255..b5310d6b104609ce7eb22decc409d492bcc7b239 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -28,11 +28,17 @@ public class DebounceModuleHelper
                setPoll(getSavedPoll());
                setHwDebounce(getSavedHwDebounce());
                setHwDebounceTime(getSavedHwDebounceTime());
+               //setDriveInactive(getSavedDriveInactive());
+               setActiveHigh(getSavedActiveHigh());
        }
 
-       public void loadModule() {
-               _loadModule();
+       public boolean loadModule() {
+               if (!_loadModule())
+                       return false;
+
                setAllValues();
+
+               return true;
        }
 
        protected void runAsRoot(String command) throws java.io.IOException,java.lang.InterruptedException {
@@ -46,7 +52,7 @@ public class DebounceModuleHelper
                rootcmd.waitFor();
        }
 
-       public synchronized void _loadModule() {
+       public synchronized boolean _loadModule() {
                File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
                extractModule();
@@ -59,28 +65,34 @@ public class DebounceModuleHelper
                }
 
                try {
-                       runAsRoot("/system/bin/insmod " + debounce_ko);
+                       runAsRoot("/system/bin/insmod " + debounce_ko + " || /system/xbin/insmod " + debounce_ko);
                } catch (Exception e) {
-                       return;
+                       return false;
                }
 
                if (!isLoaded()) {
-                       return;
+                       return false;
                }
 
                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();
+
+               return true;
        }
 
-       public synchronized void unloadModule() {
+       public synchronized boolean unloadModule() {
                try {
-                       runAsRoot("/system/bin/rmmod debounce");
-               } catch (Exception e) {}
+                       runAsRoot("/system/bin/rmmod debounce || /system/xbin/rmmod debounce");
+               } catch (Exception e) {
+                       return false;
+               }
+
+               return true;
        }
 
        public synchronized boolean isLoaded() {
@@ -136,7 +148,8 @@ public class DebounceModuleHelper
                        fbuf.write((new Integer(value)).toString());
 
                        fbuf.close();
-               } catch (Exception e) {}
+               } catch (Exception e) {
+               }
        }
 
        public synchronized int getDelay() {
@@ -185,6 +198,34 @@ public class DebounceModuleHelper
                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);
 
@@ -230,7 +271,7 @@ public class DebounceModuleHelper
        public synchronized boolean getSavedHwDebounce() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
-               return settings.getBoolean("hw_debounce", true);
+               return settings.getBoolean("hw_debounce", false);
        }
 
        public synchronized void setSavedHwDebounce(boolean enable) {
@@ -255,6 +296,34 @@ public class DebounceModuleHelper
                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);