X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/d82ae5893a5e4cc3e082cf767aa7eca7edf87830..818fb3279df0b583098df237226041b829079851:/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 229f00a..9c0a59e 100644 --- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java +++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java @@ -5,42 +5,74 @@ import java.io.OutputStream; import java.io.File; import java.io.FileReader; import java.io.BufferedReader; +import java.io.DataOutputStream; import android.content.Context; +import android.content.SharedPreferences; public class DebounceModuleHelper { private Context ctx; + public static final String PREFS_NAME = "DebounceCfg"; + final int SUPERUSER_REQUEST = 4223; public DebounceModuleHelper(Context context) { ctx = context; } public void loadModule() { - loadModule(10); + loadModule(getSavedDelay()); } - public void loadModule(int delay) { + 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"); 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(); - } catch (Exception e) {} + runAsRoot("/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay); + } 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(); + runAsRoot("/system/bin/rmmod debounce"); } catch (Exception e) {} } - public boolean isLoaded() { + public synchronized boolean isLoaded() { boolean loaded = false; try { String read; @@ -61,7 +93,7 @@ public class DebounceModuleHelper return loaded; } - public int getDelay() { + public synchronized int getDelay() { int debounce_delay = -1; try { @@ -79,6 +111,50 @@ public class DebounceModuleHelper 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", 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 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() { File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");