handle permission denied to run adb

Author: codeanticode

src/processing/mode/android/AndroidKeyStore.java

@@ -22,6 +22,9 @@
 package processing.mode.android;
 
 import processing.app.Messages;
+import processing.app.exec.ProcessHelper;
+import processing.app.exec.ProcessResult;
+import processing.core.PApplet;
 
 import java.io.File;
 
@@ -63,10 +66,8 @@ public static void generateKeyStore(String password,
         parseDnameField(commonName), parseDnameField(organizationalUnit), parseDnameField(organizationName),
         parseDnameField(locality), parseDnameField(state), parseDnameField(country));
 
-    String[] args = {
-        System.getProperty("java.home")
-            + System.getProperty("file.separator") + "bin"
-            + System.getProperty("file.separator") + "keytool", "-genkey",
+    ProcessHelper ph = new ProcessHelper(new String[] {
+        "keytool", "-genkey",
         "-keystore", getKeyStoreLocation().getAbsolutePath(),
         "-alias", ALIAS_STRING,
         "-keyalg", "RSA",
@@ -75,12 +76,45 @@ public static void generateKeyStore(String password,
         "-keypass", password,
         "-storepass", password,
         "-dname", dname
-    };
-
-    Process generation = Runtime.getRuntime().exec(args);
-    generation.waitFor();
-
-    if (getKeyStore() == null) throw new Exception();
+      });
+    
+    try {
+      ProcessResult result = ph.execute();
+      if (result.succeeded()) {
+        if (getKeyStore() == null) {
+          Messages.showWarning("Well, this is unexpected...",
+              "The keystore was succesfully cretated but cannot be found.\n" +
+              "Perhaps was it deleted accidentally?");
+        }
+      } else {
+        String[] lines = PApplet.split(result.getStderr(), '\n');
+        System.err.println("The keystore could not be created, due to the following error:");
+        for (String line: lines) {
+          System.err.println(line);
+        }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+    }      
+    
+//    String[] args = {
+//        System.getProperty("java.home")
+//            + System.getProperty("file.separator") + "bin"
+//            + System.getProperty("file.separator") + "keytool", "-genkey",
+//        "-keystore", getKeyStoreLocation().getAbsolutePath(),
+//        "-alias", ALIAS_STRING,
+//        "-keyalg", "RSA",
+//        "-keysize", "2048",
+//        "-validity", "10000",
+//        "-keypass", password,
+//        "-storepass", password,
+//        "-dname", dname
+//    };
+//
+//    Process generation = Runtime.getRuntime().exec(args);
+//    generation.waitFor();
+
+//    if (getKeyStore() == null) throw new Exception();
   }
 
   public static boolean resetKeyStore() {

src/processing/mode/android/AndroidSDK.java

@@ -21,6 +21,7 @@
 
 package processing.mode.android;
 
+import processing.app.Messages;
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.exec.ProcessHelper;
@@ -429,8 +430,15 @@ static public File selectFolder(String prompt, File folder, Frame frame) {
   private static final String ADB_DAEMON_MSG_1 = "daemon not running";
   private static final String ADB_DAEMON_MSG_2 = "daemon started successfully";
 
+  public static boolean adbDisabled = false;
+  
   public static ProcessResult runADB(final String... cmd)
-  throws InterruptedException, IOException {
+    throws InterruptedException, IOException {
+    
+    if (adbDisabled) {
+      throw new IOException("adb is currently disabled");
+    }
+    
     final String[] adbCmd;
     if (!cmd[0].equals("adb")) {
       adbCmd = PApplet.splice(cmd, "adb", 0);
@@ -441,29 +449,37 @@ public static ProcessResult runADB(final String... cmd)
     if (processing.app.Base.DEBUG) {
       PApplet.printArray(adbCmd);
     }
-//    try {
-    ProcessResult adbResult = new ProcessHelper(adbCmd).execute();
-    // Ignore messages about starting up an adb daemon
-    String out = adbResult.getStdout();
-    if (out.contains(ADB_DAEMON_MSG_1) && out.contains(ADB_DAEMON_MSG_2)) {
-      StringBuilder sb = new StringBuilder();
-      for (String line : out.split("\n")) {
-        if (!out.contains(ADB_DAEMON_MSG_1) &&
-            !out.contains(ADB_DAEMON_MSG_2)) {
-          sb.append(line).append("\n");
+    try {
+      ProcessResult adbResult = new ProcessHelper(adbCmd).execute();
+      // Ignore messages about starting up an adb daemon
+      String out = adbResult.getStdout();
+      if (out.contains(ADB_DAEMON_MSG_1) && out.contains(ADB_DAEMON_MSG_2)) {
+        StringBuilder sb = new StringBuilder();
+        for (String line : out.split("\n")) {
+          if (!out.contains(ADB_DAEMON_MSG_1) &&
+              !out.contains(ADB_DAEMON_MSG_2)) {
+            sb.append(line).append("\n");
+          }
         }
+        return new ProcessResult(adbResult.getCmd(),
+                                 adbResult.getResult(),
+                                 sb.toString(),
+                                 adbResult.getStderr(),
+                                 adbResult.getTime());
+      }
+      return adbResult;
+    } catch (IOException ioe) {
+      if (-1 < ioe.getMessage().indexOf("Permission denied")) {
+        Messages.showWarning("Trouble with adb!",
+            "Could not run the adb tool from the Android SDK.\n" +
+            "One possibility is that its executable permission\n" +
+            "is not properly set. You can try setting this\n" +
+            "permission manually, or re-installing the SDK.\n\n" +
+            "The mode will be disabled until this problem is fixed.\n");
+        adbDisabled = true;
       }
-      return new ProcessResult(adbResult.getCmd(),
-                               adbResult.getResult(),
-                               sb.toString(),
-                               adbResult.getStderr(),
-                               adbResult.getTime());
+      throw ioe;
     }
-    return adbResult;
-//    } catch (IOException ioe) {
-//      ioe.printStackTrace();
-//      throw ioe;
-//    }
   }
 
   static class SDKTarget {

src/processing/mode/android/Devices.java

@@ -286,6 +286,9 @@ void deviceRemoved(final Device device) {
    * @throws IOException
    */
   public static List<String> list() {
+    if (AndroidSDK.adbDisabled) {
+      return Collections.emptyList();
+    }
     ProcessResult result;
     try {
 //      System.out.println("listing devices 00");