some refactoring of abd calls

Author: codeanticode

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

@@ -22,7 +22,6 @@
 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;
@@ -31,7 +30,6 @@
 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;
@@ -73,8 +71,8 @@ public Device(final Devices env, final String id) {
   public void bringLauncherToFront() {
     try {
       adb("shell", "am", "start",
-          "-a", "android.intent.action.MAIN",
-          "-c", "android.intent.category.HOME");
+                 "-a", "android.intent.action.MAIN",
+                 "-c", "android.intent.category.HOME");
     } catch (final Exception e) {
       e.printStackTrace(System.err);
     }
@@ -88,12 +86,12 @@ public String getName() {
     String name = "";
 
     try {
-      ProcessResult result = env.getSDK().runADB("-s", id, "shell", "getprop", "ro.product.brand");
+      ProcessResult result = adb("shell", "getprop", "ro.product.brand");
       if (result.succeeded()) {
         name += result.getStdout() + " ";
       }
 
-      result = env.getSDK().runADB("-s", id, "shell", "getprop", "ro.product.model");
+      result = adb("shell", "getprop", "ro.product.model");
       if (result.succeeded()) {
         name += result.getStdout();
       }
@@ -208,7 +206,6 @@ public boolean launchApp(final String packageName, boolean isDebuggerEnabled)
       };
       pr = adb(cmd);
     }
-//    PApplet.println(cmd);
 
     if (Base.DEBUG) {
       System.out.println(pr.toString());
@@ -226,8 +223,9 @@ public boolean launchApp(final String packageName, boolean isDebuggerEnabled)
   public void forwardPort(int tcpPort) throws IOException, InterruptedException {
     // Start ADB Server
     adb("start-server");
-    final String[] jdwpcmd = generateAdbCommand("jdwp");
-    Process deviceId = Runtime.getRuntime().exec(jdwpcmd);
+
+    Process deviceId = adbProc("jdwp");
+
     // Get Process ID from ADB command `adb jdwp`
     JDWPProcessor pIDProcessor = new JDWPProcessor();
     new StreamPump(deviceId.getInputStream(), "jdwp: ").addTarget(
@@ -236,7 +234,8 @@ public void forwardPort(int tcpPort) throws IOException, InterruptedException {
         System.err).start();
 
     Thread.sleep(1000);
-    // forward to tcp port
+
+    // Forward to tcp port
     adb("forward", "tcp:" + tcpPort, "jdwp:" + pIDProcessor.getId());
   }
 
@@ -389,9 +388,11 @@ private void reportStackTrace(final LogEntry entry) {
 
   void initialize() throws IOException, InterruptedException {
     adb("logcat", "-c");
-    final String[] cmd = generateAdbCommand("logcat", "-v", "brief");
+
+    final String[] cmd = {"-s", id, "logcat", "-v", "brief"};
     final String title = PApplet.join(cmd, ' ');
-    logcat = Runtime.getRuntime().exec(cmd);
+    logcat = adbProc(cmd);
+
     ProcessRegistry.watch(logcat);
     new StreamPump(logcat.getInputStream(), "log: " + title).addTarget(
       new LogLineProcessor()).start();
@@ -465,15 +466,17 @@ public void removeListener(final DeviceListener listener) {
   }
 
   private ProcessResult adb(final String... cmd) throws InterruptedException, IOException {
-    final String[] adbCmd = generateAdbCommand(cmd);
-    return env.getSDK().runADB(adbCmd);
+    final String[] adbCmd = genAdbCommand(cmd);
+    return env.getSDK().runAdb(adbCmd);
+  }
+
+  private Process adbProc(final String... cmd) throws IOException {
+    final String[] adbCmd = genAdbCommand(cmd);
+    return env.getSDK().getAdbProcess(adbCmd);
   }
 
-  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);
+  private String[] genAdbCommand(final String... cmd) {
+    return PApplet.concat(new String[] { "-s", getId() }, cmd);
   }
 
   @Override

processing/mode/src/processing/mode/android/Devices.java

@@ -83,7 +83,7 @@ public void killAdbServer() {
     System.out.print("Shutting down any existing adb server...");
     System.out.flush();
     try {
-      sdk.runADB("kill-server");
+      sdk.runAdb("kill-server");
       System.out.println(" Done.");
     } catch (final Exception e) {
       System.err.println("/nDevices.killAdbServer() failed.");
@@ -95,7 +95,7 @@ public void startAdbServer() {
     System.out.print("Starting a new adb server...");
     System.out.flush();
     try {
-      sdk.runADB("start-server");
+      sdk.runAdb("start-server");
       System.out.println(" Done.");
     } catch (final Exception e) {
       System.err.println("/nDevices.startAdbServer() failed.");
@@ -118,9 +118,9 @@ public void enableBluetoothDebugging() {
     try {
       // Try Enable debugging over bluetooth
       // http://developer.android.com/training/wearables/apps/bt-debugging.html
-      sdk.runADB("-s", device.getId(), "forward", "tcp:" + 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);
+      sdk.runAdb("connect", "127.0.0.1:" + BT_DEBUG_PORT);
     } catch (final Exception e) {
       e.printStackTrace();
     }    
@@ -349,7 +349,7 @@ public List<String> list() {
     ProcessResult result;
     try {
 //      System.out.println("listing devices 00");
-      result = sdk.runADB("devices");
+      result = sdk.runAdb("devices");
 //      System.out.println("listing devices 05");
     } catch (InterruptedException e) {
       return Collections.emptyList();