<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.rmdir.ms2debounce"
- android:versionCode="4"
- android:versionName="1.4">
+ android:versionCode="5"
+ android:versionName="1.5">
<uses-sdk android:minSdkVersion="8" />
<uses-configuration android:reqKeyboardType="qwerty" />
<supports-screens android:smallScreens="false"
DebounceModuleHelper module = new DebounceModuleHelper(context);
if (module.get_on_boot() && module.is_safe_to_load()) {
- module.loadModule();
+ try {
+ module.loadModule();
+ } catch (Exception e) {}
}
}
}
setActiveHigh(getSavedActiveHigh());
}
- public boolean loadModule() {
+ public boolean loadModule() throws NotRootedException,ShellException {
if (!_loadModule())
return false;
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;
- rootcmd.waitFor();
+ 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() {
+ public synchronized boolean _loadModule() throws NotRootedException,ShellException {
File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
extractModule();
editor.commit();
}
- try {
- runAsRoot("/system/bin/insmod " + debounce_ko + " || /system/xbin/insmod " + debounce_ko);
- } catch (Exception e) {
- return false;
- }
+ runAsRoot("/system/bin/insmod " + debounce_ko + " || /system/xbin/insmod " + debounce_ko);
if (!isLoaded()) {
return false;
return true;
}
- public synchronized boolean unloadModule() {
- try {
- runAsRoot("/system/bin/rmmod debounce || /system/xbin/rmmod debounce");
- } catch (Exception e) {
- return false;
- }
-
- return true;
+ public synchronized void unloadModule() throws NotRootedException,ShellException {
+ runAsRoot("/system/bin/rmmod debounce || /system/xbin/rmmod debounce");
}
public synchronized boolean isLoaded() {
fbuf.write((new Integer(value)).toString());
fbuf.close();
- } catch (Exception e) {
- }
+ } catch (Exception e) {}
}
public synchronized int getDelay() {
public void loadModule(View view) {
disableUI();
if (!module.isLoaded()) {
- if (!module.loadModule())
- showDialog(23);
+ try {
+ if (!module.loadModule())
+ showDialog(22);
+ } catch (NotRootedException e) {
+ showDialog(23);
+ } catch (ShellException e) {
+ showDialog(24);
+ }
}
updateUI();
}
public void unloadModule(View view) {
disableUI();
if (module.isLoaded()) {
- if (!module.unloadModule())
- showDialog(23);
+ try {
+ module.unloadModule();
+ } catch (NotRootedException e) {
+ showDialog(23);
+ } catch (ShellException e) {
+ showDialog(24);
+ }
}
updateUI();
}
public void setValues(View view) {
disableUI();
if (!module.isLoaded()) {
- if (!module.loadModule())
+ try {
+ if (!module.loadModule())
+ showDialog(22);
+ } catch (NotRootedException e) {
showDialog(23);
+ } catch (ShellException e) {
+ showDialog(24);
+ }
}
module.setAllValues();
updateUI();
Dialog dlg = null;
switch(id) {
+ case 22:
+ AlertDialog.Builder noload = new AlertDialog.Builder(this);
+ noload.setMessage("Could not load/unload the module! Do you have a MS2/Droid2 with kernel 2.6.32?")
+ .setCancelable(true)
+ .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.cancel();
+ }
+ });
+ dlg = noload.create();
+ break;
case 23:
AlertDialog.Builder noroot = new AlertDialog.Builder(this);
- noroot.setMessage("Could not get root access! Is this device rooted and have you granted SuperUser privileges?")
+ noroot.setMessage("Could not get root access! Is this device rooted and have you granted Superuser privileges?")
.setCancelable(true)
.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
});
dlg = noroot.create();
break;
+ case 24:
+ AlertDialog.Builder shellexec = new AlertDialog.Builder(this);
+ shellexec.setMessage("Problems executing shell commands as root! Is this device rooted and are insmod/rmmod binaries available?")
+ .setCancelable(true)
+ .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.cancel();
+ }
+ });
+ dlg = shellexec.create();
+ break;
case 42:
AlertDialog.Builder about = new AlertDialog.Builder(this);
about.setMessage("Milestone 2 Debounce\n\n(C) 2011 Michael Gernoth <michael@gernoth.net>\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA")
--- /dev/null
+package de.rmdir.ms2debounce;
+
+class NotRootedException extends Exception {
+}
--- /dev/null
+package de.rmdir.ms2debounce;
+
+class ShellException extends Exception {
+}
projects / ms2-fixes / commitdiff