show additional warning message when connection is lost with emulator

codeanticode · codeanticode · commit 93fd8865c8ca · 2017-02-19T18:43:57.000-05:00
diff --git a/src/processing/mode/android/AndroidRunner.java b/src/processing/mode/android/AndroidRunner.java
@@ -30,6 +30,7 @@
 import java.util.regex.Pattern;
 
 import processing.app.ui.Editor;
+import processing.app.Messages;
 import processing.app.RunnerListener;
 import processing.app.SketchException;
 import processing.mode.java.runner.Runner;
@@ -98,7 +99,18 @@ public void launch(Future<Device> deviceFuture, boolean wear) {
     listener.statusNotice("Installing sketch on " + device.getId());
     // this stopped working with Android SDK tools revision 17
     if (!device.installApp(build, listener)) {
-      listener.statusError("Lost connection with device while installing. Try again.");
+      if (device.getId().contains("emulator")) {
+        // More detailed message when using the emulator, to following discussion in
+        // https://code.google.com/p/android/issues/detail?id=104305
+        listener.statusError("Lost connection with emulator while installing. Try again.");
+        Messages.showWarning("The emulator is slooow...",
+          "This is common when the emulator is booting up for the first time.\n" +
+          "Just try again once the emulator is ready, or set the\n" + 
+          "ADB_INSTALL_TIMEOUT environmental variable to have a.\n" +
+          "longer timeout, for example 5 minutes or more");
+      } else {
+        listener.statusError("Lost connection with device while installing. Try again.");
+      }
       Devices.killAdbServer();  // see above
       return;
     }
@@ -111,8 +123,8 @@ public void launch(Future<Device> deviceFuture, boolean wear) {
 //  monitor.setNote("Starting sketch on " + device.getId());
     listener.statusNotice("Starting sketch on " + device.getId());
     if (startSketch(build, device)) {
-      listener.statusNotice("Sketch launched on the "
-                            + (device.isEmulator() ? "emulator" : "device") + ".");
+      listener.statusNotice("Sketch launched "
+                            + (device.isEmulator() ? "in the emulator" : "on the device") + ".");
     } else {
       listener.statusError("Could not start the sketch.");
     }
