Added sdk instance to Devices, so runADB() does not need to be static

codeanticode · codeanticode · commit 7c1542eb3b5d · 2017-08-11T15:14:44.000-04:00
diff --git a/src/processing/mode/android/AndroidEditor.java b/src/processing/mode/android/AndroidEditor.java
@@ -105,12 +105,13 @@ private Device selectFirstDevice(java.util.List<Device> deviceList) {
     @Override
     public void run() {
       if (androidMode == null || androidMode.getSDK() == null) return;
+
+      final Devices devices = Devices.getInstance();
       
       if (appComponent == AndroidBuild.WATCHFACE) {
-        Devices.enableBluetoothDebugging();
+        devices.enableBluetoothDebugging();
       }
-
-      final Devices devices = Devices.getInstance();
+      
       java.util.List<Device> deviceList = devices.findMultiple(false);
       Device selectedDevice = devices.getSelectedDevice();
 
@@ -633,7 +634,8 @@ public void actionPerformed(ActionEvent e) {
     item.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
 //        editor.statusNotice("Resetting the Android Debug Bridge server.");
-        Devices.killAdbServer();
+        final Devices devices = Devices.getInstance();
+        devices.killAdbServer();
       }
     });
     androidMenu.add(item);    
diff --git a/src/processing/mode/android/AndroidMode.java b/src/processing/mode/android/AndroidMode.java
@@ -219,6 +219,9 @@ public void checkSDK(Editor editor) {
       Messages.showWarning("Bad news...",
                            "The Android SDK could not be loaded.\n" +
                            "The Android Mode will be disabled.", tr);
+    } else {
+      Devices devices = Devices.getInstance();
+      devices.setSDK(sdk);
     }
     checkingSDK = false;
   }
@@ -282,7 +285,7 @@ public void handleRunEmulator(Sketch sketch, AndroidEditor editor,
     }
 
     int comp = build.getAppComponent();
-    Future<Device> emu = Devices.getInstance().getEmulator(sdk.getToolsFolder(), build.isWear());
+    Future<Device> emu = Devices.getInstance().getEmulator(build.isWear());
     runner = new AndroidRunner(build, listener);
     runner.launch(emu, comp, true);
   }
diff --git a/src/processing/mode/android/AndroidRunner.java b/src/processing/mode/android/AndroidRunner.java
@@ -69,7 +69,8 @@ public boolean launch(Future<Device> deviceFuture, int comp, boolean emu) {
       listener.statusError("Lost connection with " + devStr + " while launching. Try again.");
       // Reset the server, in case that's the problem. Sometimes when
       // launching the emulator times out, the device list refuses to update.
-      Devices.killAdbServer();
+      final Devices devices = Devices.getInstance();
+      devices.killAdbServer();
       return false;
     }
     
@@ -96,7 +97,8 @@ public boolean launch(Future<Device> deviceFuture, int comp, boolean emu) {
     // this stopped working with Android SDK tools revision 17
     if (!device.installApp(build, listener)) {
       listener.statusError("Lost connection with " + devStr + " while installing. Try again.");
-      Devices.killAdbServer();  // see above
+      final Devices devices = Devices.getInstance();
+      devices.killAdbServer();  // see above
       return false;
     }
 
diff --git a/src/processing/mode/android/AndroidSDK.java b/src/processing/mode/android/AndroidSDK.java
@@ -688,23 +688,25 @@ 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 ProcessResult runADB(final String... cmd)
+  public ProcessResult runADB(final String... cmd)
     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);
+    if (!cmd[0].contains("adb")) {      
+      File abdPath = Platform.isWindows() ? new File(platformTools, "adb.exe") :
+                                            new File(platformTools, "adb");
+      adbCmd = PApplet.splice(cmd, abdPath.getCanonicalPath(), 0);
     } else {
       adbCmd = cmd;
     }
     // printing this here to see if anyone else is killing the adb server
-    if (processing.app.Base.DEBUG) {
+//    if (processing.app.Base.DEBUG) {
       PApplet.printArray(adbCmd);
-    }
+//    }
     try {
       ProcessResult adbResult = new ProcessHelper(adbCmd).execute();
       // Ignore messages about starting up an adb daemon
diff --git a/src/processing/mode/android/Commander.java b/src/processing/mode/android/Commander.java
@@ -239,7 +239,7 @@ private void execute() {
         if (task == RUN) {
           AndroidRunner runner = new AndroidRunner(build, this);
           runner.launch(runOnEmu ?
-              Devices.getInstance().getEmulator(androidMode.getSDK().getToolsFolder(), build.isWear()) :
+              Devices.getInstance().getEmulator(build.isWear()) :
               Devices.getInstance().getHardware(), build.getAppComponent(), runOnEmu);
         }
 
diff --git a/src/processing/mode/android/Device.java b/src/processing/mode/android/Device.java
@@ -22,6 +22,7 @@
 package processing.mode.android;
 
 import processing.app.Base;
+import processing.app.Platform;
 import processing.app.RunnerListener;
 import processing.app.exec.LineProcessor;
 import processing.app.exec.ProcessRegistry;
@@ -30,6 +31,7 @@
 import processing.core.PApplet;
 import processing.mode.android.LogEntry.Severity;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -86,12 +88,12 @@ public String getName() {
     String name = "";
 
     try {
-      ProcessResult result = AndroidSDK.runADB("-s", id, "shell", "getprop", "ro.product.brand");
+      ProcessResult result = env.getSDK().runADB("-s", id, "shell", "getprop", "ro.product.brand");
       if (result.succeeded()) {
         name += result.getStdout() + " ";
       }
 
-      result = AndroidSDK.runADB("-s", id, "shell", "getprop", "ro.product.model");
+      result = env.getSDK().runADB("-s", id, "shell", "getprop", "ro.product.model");
       if (result.succeeded()) {
         name += result.getStdout();
       }
@@ -407,17 +409,14 @@ public void removeListener(final DeviceListener listener) {
 
   private ProcessResult adb(final String... cmd) throws InterruptedException, IOException {
     final String[] adbCmd = generateAdbCommand(cmd);
-    return AndroidSDK.runADB(adbCmd);
+    return env.getSDK().runADB(adbCmd);
   }
 
-  private String[] generateAdbCommand(final String... cmd) {
-    //    final String[] adbCmd = new String[3 + cmd.length];
-    //    adbCmd[0] = "adb";
-    //    adbCmd[1] = "-s";
-    //    adbCmd[2] = getId();
-    //    System.arraycopy(cmd, 0, adbCmd, 3, cmd.length);
-    //    return adbCmd;
-    return PApplet.concat(new String[] { "adb", "-s", getId() }, cmd);
+  private String[] generateAdbCommand(final String... cmd) throws IOException {
+    File toolsPath = env.getSDK().getPlatformToolsFolder();
+    File abdPath = Platform.isWindows() ? new File(toolsPath, "adb.exe") :
+                                          new File(toolsPath, "adb");    
+    return PApplet.concat(new String[] { abdPath.getCanonicalPath(), "-s", getId() }, cmd);
   }
 
   @Override
diff --git a/src/processing/mode/android/Devices.java b/src/processing/mode/android/Devices.java
@@ -24,7 +24,6 @@
 import processing.app.exec.ProcessResult;
 import processing.mode.android.EmulatorController.State;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -50,6 +49,8 @@ class Devices {
 
   private static final String BT_DEBUG_PORT = "4444";
   
+  private AndroidSDK sdk;
+  
   private Device selectedDevice;
 
   public static Devices getInstance() {
@@ -61,6 +62,14 @@ public static Devices getInstance() {
   private final ExecutorService deviceLaunchThread =
     Executors.newSingleThreadExecutor();
 
+  public void setSDK(AndroidSDK sdk) {
+    this.sdk = sdk;
+  }
+
+  public AndroidSDK getSDK() {
+    return sdk;
+  }  
+  
   public Device getSelectedDevice() {
     return selectedDevice;
   }
@@ -69,18 +78,18 @@ public void setSelectedDevice(Device selectedDevice) {
     this.selectedDevice = selectedDevice;
   }
 
-  public static void killAdbServer() {
+  public void killAdbServer() {
     System.out.println("Shutting down any existing adb server...");
     System.out.flush();
     try {
-      AndroidSDK.runADB("kill-server");
+      sdk.runADB("kill-server");
     } catch (final Exception e) {
       System.err.println("Devices.killAdbServer() failed.");
       e.printStackTrace();
     }
   }
 
-  public static void enableBluetoothDebugging() {
+  public void enableBluetoothDebugging() {
     final Devices devices = Devices.getInstance();
     java.util.List<Device> deviceList = devices.findMultiple(false);
     
@@ -95,8 +104,8 @@ public static void enableBluetoothDebugging() {
     try {
       // Try Enable debugging over bluetooth
       // http://developer.android.com/training/wearables/apps/bt-debugging.html
-      AndroidSDK.runADB("-s", device.getId(), "forward", "tcp:" + BT_DEBUG_PORT, "localabstract:/adb-hub");
-      AndroidSDK.runADB("connect", "127.0.0.1:" + BT_DEBUG_PORT);
+      sdk.runADB("-s", device.getId(), "forward", "tcp:" + BT_DEBUG_PORT, "localabstract:/adb-hub");
+      sdk.runADB("connect", "127.0.0.1:" + BT_DEBUG_PORT);
     } catch (final Exception e) {
       e.printStackTrace();
     }    
@@ -123,10 +132,10 @@ public void run() {
   }
 
 
-  public Future<Device> getEmulator(final File sdkToolsPath, final boolean wear) {
+  public Future<Device> getEmulator(final boolean wear) {
     final Callable<Device> androidFinder = new Callable<Device>() {
       public Device call() throws Exception {
-        return blockingGetEmulator(sdkToolsPath, wear);
+        return blockingGetEmulator( wear);
       }
     };
     final FutureTask<Device> task = new FutureTask<Device>(androidFinder);
@@ -135,7 +144,7 @@ public Device call() throws Exception {
   }
 
 
-  private final Device blockingGetEmulator(final File sdkToolsPath, final boolean wear) {
+  private final Device blockingGetEmulator(final boolean wear) {
     String port = AVD.getPreferredPort(wear);
     Device emu = find(true, port);
     if (emu != null) {
@@ -151,7 +160,7 @@ private final Device blockingGetEmulator(final File sdkToolsPath, final boolean
     
     if (emuController.getState() == State.NOT_RUNNING) {
       try {
-        emuController.launch(sdkToolsPath, wear); // this blocks until emulator boots
+        emuController.launch(sdk, wear); // this blocks until emulator boots
       } catch (final IOException e) {
         System.err.println("Problem while launching emulator.");
         e.printStackTrace(System.err);
@@ -309,15 +318,15 @@ void deviceRemoved(final Device device) {
    * @return list of device identifiers
    * @throws IOException
    */
-  public static List<String> list() {
+  public List<String> list() {
     if (AndroidSDK.adbDisabled) {
       return Collections.emptyList();
     }
     
     ProcessResult result;
     try {
 //      System.out.println("listing devices 00");
-      result = AndroidSDK.runADB("devices");
+      result = sdk.runADB("devices");
 //      System.out.println("listing devices 05");
     } catch (InterruptedException e) {
       return Collections.emptyList();
diff --git a/src/processing/mode/android/EmulatorController.java b/src/processing/mode/android/EmulatorController.java
@@ -58,7 +58,7 @@ public void setState(final State state) {
    * Blocks until emulator is running, or some catastrophe happens.
    * @throws IOException
    */
-  synchronized public void launch(File sdkToolsPath, boolean wear) 
+  synchronized public void launch(final AndroidSDK sdk, final boolean wear) 
       throws IOException {
     if (state != State.NOT_RUNNING) {
       String illegal = "You can't launch an emulator whose state is " + state;
@@ -75,8 +75,8 @@ synchronized public void launch(File sdkToolsPath, boolean wear)
     // https://developer.android.com/studio/run/emulator-acceleration.html#accel-graphics
     String gpuFlag = "auto";
     
-    File emulatorPath = Platform.isWindows() ? new File(sdkToolsPath, "emulator.exe") :
-                                               new File(sdkToolsPath, "emulator");
+    File emulatorPath = Platform.isWindows() ? new File(sdk.getToolsFolder(), "emulator.exe") :
+                                               new File(sdk.getToolsFolder(), "emulator");
     final String[] cmd = new String[] {
       emulatorPath.getCanonicalPath(),
       "-avd", avdName,
@@ -143,8 +143,8 @@ public void run() {
             }
             Thread.sleep(2000);
             //System.out.println("done sleeping");
-            ProcessResult result = AndroidSDK.runADB("-s", "emulator-" + portString,
-                    "shell", "getprop", "dev.bootcomplete");
+            ProcessResult result = sdk.runADB("-s", "emulator-" + portString,
+              "shell", "getprop", "dev.bootcomplete");
             if (result.getStdout().equals("1\n")) {
               setState(State.RUNNING);
               return;

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,9 @@ public void checkSDK(Editor editor) {`
`219`	`219`	`Messages.showWarning("Bad news...",`
`220`	`220`	`"The Android SDK could not be loaded.\n" +`
`221`	`221`	`"The Android Mode will be disabled.", tr);`
	`222`	`+ } else {`
	`223`	`+ Devices devices = Devices.getInstance();`
	`224`	`+ devices.setSDK(sdk);`
`222`	`225`	`}`
`223`	`226`	`checkingSDK = false;`
`224`	`227`	`}`
`@@ -282,7 +285,7 @@ public void handleRunEmulator(Sketch sketch, AndroidEditor editor,`
`282`	`285`	`}`
`283`	`286`
`284`	`287`	`int comp = build.getAppComponent();`
`285`		`- Future<Device> emu = Devices.getInstance().getEmulator(sdk.getToolsFolder(), build.isWear());`
	`288`	`+ Future<Device> emu = Devices.getInstance().getEmulator(build.isWear());`
`286`	`289`	`runner = new AndroidRunner(build, listener);`
`287`	`290`	`runner.launch(emu, comp, true);`
`288`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ private void execute() {`
`239`	`239`	`if (task == RUN) {`
`240`	`240`	`AndroidRunner runner = new AndroidRunner(build, this);`
`241`	`241`	`runner.launch(runOnEmu ?`
`242`		`- Devices.getInstance().getEmulator(androidMode.getSDK().getToolsFolder(), build.isWear()) :`
	`242`	`+ Devices.getInstance().getEmulator(build.isWear()) :`
`243`	`243`	`Devices.getInstance().getHardware(), build.getAppComponent(), runOnEmu);`
`244`	`244`	`}`
`245`	`245`