performance improvements

[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 7a9f3de200d4df1fe87f7744177487228699927b..39a29a8287d145de9032fad87a8da35218ab529b 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -3,43 +3,145 @@ package de.rmdir.ms2debounce;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.File;

+import java.io.FileReader;
+import java.io.BufferedReader;

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

+import android.content.SharedPreferences;

 
 public class DebounceModuleHelper
 {
        private Context ctx;
 
 public class DebounceModuleHelper
 {
        private Context ctx;

+       public static final String PREFS_NAME = "DebounceCfg";

 
        public DebounceModuleHelper(Context context) {
                ctx = context;
        }
 
        public void loadModule() {
 
        public DebounceModuleHelper(Context context) {
                ctx = context;
        }
 
        public void loadModule() {

-               loadModule(10);
+               loadModule(getSavedDelay());

        }
 
        }
 

-       public void loadModule(int delay) {
+       public synchronized void loadModule(int delay) {

                File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
                extractModule();
 
                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();
 
                try {
                        Process insmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay});
                        insmod.waitFor();

-               } catch (Exception e) {}
+               } catch (Exception e) {
+                       return;
+               }
+
+               if (!isLoaded()) {
+                       return;
+               }
+
+               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 void unloadModule() {
+       public synchronized void unloadModule() {

                try {
                        Process rmmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/rmmod debounce"});
                        rmmod.waitFor();
                } catch (Exception e) {}
        }
 
                try {
                        Process rmmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/rmmod debounce"});
                        rmmod.waitFor();
                } catch (Exception e) {}
        }
 

-       public boolean isLoaded() {
-               return false;
+       public synchronized boolean isLoaded() {
+               boolean loaded = false;
+               try {
+                       String read;
+
+                       FileReader modules = new FileReader("/proc/modules");
+                       BufferedReader modules_buf = new BufferedReader(modules);
+
+                       while((read = modules_buf.readLine()) != null) {
+                               if (read.regionMatches(0, "debounce", 0, 8)) {
+                                       loaded = true;
+                               }
+                       }
+
+               } catch (Exception e) {
+                       loaded = false;
+               }
+
+               return loaded;
+       }
+
+       public synchronized int getDelay() {
+               int debounce_delay = -1;
+
+               try {
+                       String read;
+
+                       FileReader delay = new FileReader("/sys/module/debounce/parameters/debounce_delay");
+                       BufferedReader delay_buf = new BufferedReader(delay);
+
+                       read = delay_buf.readLine();
+                       if (read != null) {
+                               debounce_delay = Integer.parseInt(read.trim());
+                       }
+               } catch (Exception e) {}
+
+               return debounce_delay;
+       }
+
+       public synchronized void setDelay(int delay) {
+               if (isLoaded()) {
+                       if (getDelay() == delay) {
+                               return;
+                       }
+
+                       unloadModule();
+               }
+
+               loadModule(delay);
+       }
+
+       public synchronized int getSavedDelay() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getInt("debounce_delay", 10);
+       }
+
+       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);
+               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();
+
+               editor.putBoolean("on_boot", on_boot);
+               editor.commit();

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