Show USB driver warning

imilka · imilka · commit 12ce9c34e592 · 2014-08-17T00:46:22.000+04:00
diff --git a/src/processing/mode/android/AndroidEditor.java b/src/processing/mode/android/AndroidEditor.java
@@ -482,21 +482,44 @@ public void run() {
    * Build the sketch and run it on a device with the debugger connected.
    */
   public void handleRunDevice() {
-    new Thread() {
-      public void run() {
-        toolbar.activate(AndroidToolbar.RUN);
-        startIndeterminate();
-        prepareRun();
-        try {
-          androidMode.handleRunDevice(sketch, AndroidEditor.this);
-        } catch (SketchException e) {
-          statusError(e);
-        } catch (IOException e) {
-          statusError(e);
-        }
-        stopIndeterminate();
+    if(Base.isWindows() && !Preferences.getBoolean("usbDriverWarningShown")) {
+      Preferences.setBoolean("usbDriverWarningShown", true);
+
+      String message = "";
+      File usbDriverFile = new File(((AndroidMode) sketch.getMode()).getSDK().getSdkFolder(), "extras/google/usb_driver");
+      if (usbDriverFile.exists()) {
+        message = "<html><body>" +
+            "You might need to install Google USB Driver to run the sketch on your device.<br>" +
+            "Please follow the guide at <a href='http://developer.android.com/tools/extras/oem-usb.html#InstallingDriver'>http://developer.android.com/tools/extras/oem-usb.html#InstallingDriver</a> to install the driver.<br>" +
+            "For your reference, the driver is located in: " + usbDriverFile.getAbsolutePath();
+      } else {
+        message = "<html><body>" +
+            "You might need to install Google USB Driver to run the sketch on your device.<br>" +
+            "Please follow the guide at <a href='http://developer.android.com/tools/extras/oem-usb.html#InstallingDriver'>http://developer.android.com/tools/extras/oem-usb.html#InstallingDriver</a> to install the driver.<br>" +
+            "You will also need to download the driver from <a href='http://developer.android.com/sdk/win-usb.html'>http://developer.android.com/sdk/win-usb.html</a>";
       }
-    }.start();
+
+      Base.showWarning(
+          "USB Driver warning",
+          message
+      );
+    } else {
+      new Thread() {
+        public void run() {
+          toolbar.activate(AndroidToolbar.RUN);
+          startIndeterminate();
+          prepareRun();
+          try {
+            androidMode.handleRunDevice(sketch, AndroidEditor.this);
+          } catch (SketchException e) {
+            statusError(e);
+          } catch (IOException e) {
+            statusError(e);
+          }
+          stopIndeterminate();
+        }
+      }.start();
+    }
   }
 
 
diff --git a/src/processing/mode/android/SDKDownloader.java b/src/processing/mode/android/SDKDownloader.java
@@ -32,6 +32,7 @@ public class SDKDownloader extends JFrame implements PropertyChangeListener {
 
   private static final String URL_REPOSITORY = "https://dl-ssl.google.com/android/repository/repository-10.xml";
   private static final String URL_REPOSITORY_FOLDER = "http://dl-ssl.google.com/android/repository/";
+  private static final String URL_USB_DRIVER = "https://dl-ssl.google.com//android/repository/latest_usb_driver_windows.zip";
 
   private static final String PLATFORM_API_LEVEL = "10";
 
@@ -69,6 +70,8 @@ protected Object doInBackground() throws Exception {
       if (!platformsFolder.exists()) platformsFolder.mkdir();
       File buildToolsFolder = new File(sdkFolder, "build-tools");
       if (!buildToolsFolder.exists()) buildToolsFolder.mkdir();
+      File extrasFolder = new File(sdkFolder, "extras");
+      if(!extrasFolder.exists()) extrasFolder.mkdir();
 
       // creating temp folder for downloaded zip packages
       File tempFolder = new File(modeFolder, "temp");
@@ -95,6 +98,13 @@ protected Object doInBackground() throws Exception {
         File downloadedPlatform = new File(tempFolder, downloadUrls.platformFilename);
         downloadAndUnpack(downloadUrls.platformUrl, downloadedPlatform, platformsFolder);
 
+        // usb driver
+        if(Base.isWindows()) {
+          File usbDriverFolder = new File(extrasFolder, "google");
+          File downloadedFolder = new File(tempFolder, "latest_usb_driver_windows.zip");
+          downloadAndUnpack(URL_USB_DRIVER, downloadedFolder, usbDriverFolder);
+        }
+
         if (Base.isLinux() || Base.isMacOS()) {
           Runtime.getRuntime().exec("chmod -R 755 " + sdkFolder.getAbsolutePath());
         }
