error checks, manifest updates to limit market devices

[ms2-fixes] / MS2Debounce / src / de / rmdir / ms2debounce / MS2Debounce.java

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
index 27508fcaa31343e8140aef0a9e4f305a1a54f57f..c7ba1b9cbf721ebeb6f7a6e8e1022c66853de661 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
@@ -238,7 +238,8 @@ public class MS2Debounce extends Activity
        public void loadModule(View view) {
                disableUI();
                if (!module.isLoaded()) {
-                       module.loadModule();
+                       if (!module.loadModule())
+                               showDialog(23);
                }
                updateUI();
        }
@@ -246,7 +247,8 @@ public class MS2Debounce extends Activity
        public void unloadModule(View view) {
                disableUI();
                if (module.isLoaded()) {
-                       module.unloadModule();
+                       if (!module.unloadModule())
+                               showDialog(23);
                }
                updateUI();
        }
@@ -254,7 +256,8 @@ public class MS2Debounce extends Activity
        public void setValues(View view) {
                disableUI();
                if (!module.isLoaded()) {
-                       module.loadModule();
+                       if (!module.loadModule())
+                               showDialog(23);
                }
                module.setAllValues();
                updateUI();
@@ -305,15 +308,33 @@ public class MS2Debounce extends Activity
        protected Dialog onCreateDialog(int id) {
                Dialog dlg = null;
 
-               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")
-                       .setCancelable(true)
-                       .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-                               public void onClick(DialogInterface dialog, int id) {
-                                       dialog.cancel();
-                               }
-                       });
-               dlg = about.create();
+               switch(id) {
+                       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?")
+                                       .setCancelable(true)
+                                       .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                                               public void onClick(DialogInterface dialog, int id) {
+                                                       dialog.cancel();
+                                               }
+                                       });
+                               dlg = noroot.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")
+                                       .setCancelable(true)
+                                       .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                                               public void onClick(DialogInterface dialog, int id) {
+                                                       dialog.cancel();
+                                               }
+                                       });
+                               dlg = about.create();
+                               break;
+                       default:
+                               dlg = null;
+                               break;
+               }
 
                return dlg;
        }