Fix : waiting-for-debugger dialog shown every-time

Author: manav-mj

mode/src/processing/mode/android/AndroidRunner.java

@@ -55,10 +55,16 @@ public class AndroidRunner implements DeviceListener {
 
   private VirtualMachine vm;
 
+  private boolean isDebugEnabled;
+
   public AndroidRunner(AndroidBuild build, RunnerListener listener) {
     this.build = build;
     this.listener = listener;
 
+    if (listener instanceof AndroidEditor){
+      isDebugEnabled = ((AndroidEditor) listener).isDebuggerEnabled();
+    }
+
     if (listener instanceof Editor) {
       Editor editor = (Editor) listener;
       sketchErr = editor.getConsole().getErr();
@@ -131,11 +137,9 @@ public boolean launch(Future<Device> deviceFuture, int comp, boolean emu) {
       }
     }
 
-    if (listener instanceof AndroidEditor){
-      AndroidDebugger debugger = ((AndroidEditor) listener).getDebugger();
-      if (debugger.isEnabled()) {
-        debugger.startDebug(this, device);
-      }
+    if (isDebugEnabled){
+      ((AndroidEditor) listener).getDebugger()
+        .startDebug(this, device);
     }
 
     listener.stopIndeterminate();
@@ -190,7 +194,7 @@ public VirtualMachine vm(){
   private boolean startSketch(AndroidBuild build, final Device device) {
     final String packageName = build.getPackageName();
     try {
-      if (device.launchApp(packageName)) {
+      if (device.launchApp(packageName, isDebugEnabled)) {
         return true;
       }
     } catch (final Exception e) {

mode/src/processing/mode/android/Device.java

@@ -184,21 +184,32 @@ public boolean removeApp(String packageName) throws IOException, InterruptedExce
 
   // different version that actually runs through JDI:
   // http://asantoso.wordpress.com/2009/09/26/using-jdb-with-adb-to-debugging-of-android-app-on-a-real-device/
-  public boolean launchApp(final String packageName)
+  public boolean launchApp(final String packageName, boolean isDebuggerEnabled)
       throws IOException, InterruptedException {
     if (!isAlive()) {
       return false;
     }
-
-    String[] cmd = {
-            "shell", "am", "start",
-            "-e", "debugEnabled", "true",
-            "-a", "android.intent.action.MAIN",
-            "-c", "android.intent.category.LAUNCHER", "-D",
-            "-n", packageName + "/.MainActivity"
-    };
+    ProcessResult pr;
+    if (isDebuggerEnabled){
+      String[] cmd = {
+        "shell", "am", "start",
+        "-e", "debugEnabled", "true",
+        "-a", "android.intent.action.MAIN",
+        "-c", "android.intent.category.LAUNCHER", "-D",
+        "-n", packageName + "/.MainActivity"
+      };
+      pr = adb(cmd);
+    }else {
+      String[] cmd = {
+        "shell", "am", "start",
+        "-e", "debugEnabled", "true",
+        "-a", "android.intent.action.MAIN",
+        "-c", "android.intent.category.LAUNCHER",
+        "-n", packageName + "/.MainActivity"
+      };
+      pr = adb(cmd);
+    }
 //    PApplet.println(cmd);
-    ProcessResult pr = adb(cmd);
 
     if (Base.DEBUG) {
       System.out.println(pr.toString());