tweaked init logic to support new SDK behavior

Author: codeanticode

mode/languages/mode.properties

@@ -28,6 +28,7 @@ menu.android.devices = Devices
 menu.android.devices.no_connected_devices = No connected devices
 menu.android.sdk_updater = SDK Updater
 menu.android.reset_adb = Reset ADB
+menu.android.accept_licenses = Accept SDK licenses
 
 # | File | Edit | Sketch | Android | Tools | Help |
 #                                          | Help |
@@ -174,6 +175,7 @@ android_sdk.error.missing_build_tools_folder = There is no build-tools folder in
 android_sdk.error.missing_platforms_folder = There is no platforms folder in %s  
 android_sdk.error.missing_target_platform = There is no Android %s in %s
 android_sdk.error.missing_android_jar = android.jar for plaform %s is missing from %s
+android_sdk.error.missing_emulator = The emulator files are missing
 android_debugger.info.removing_expired_keystore = Removing expired debug.keystore file.
 android_debugger.error.cannot_remove_expired_keystore = Could not remove the expired debug.keystore file.
 android_debugger.error.request_removing_keystore = Please remove the file %s

mode/src/processing/mode/android/AndroidEditor.java

@@ -652,6 +652,14 @@ public void actionPerformed(ActionEvent e) {
       }
     });
     androidMenu.add(item);
+    
+    item = new JMenuItem(AndroidMode.getTextString("menu.android.accept_licenses"));
+    item.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        androidMode.getSDK().acceptLicenses();
+      }
+    });
+    androidMenu.add(item);    
   }
 
   private void initDebugger() {

mode/src/processing/mode/android/AndroidSDK.java

@@ -99,10 +99,13 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
       throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_sdk_folder", folder));
     }
 
-    cmdlineTools = new File(folder, "cmdline-tools");
-    if (!cmdlineTools.exists()) {
-      throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_tools_folder", folder));
-    }
+    File tmp = new File(folder, "cmdline-tools/latest");
+    if (!tmp.exists()) {
+      tmp = new File(folder, "tools");
+    } else if (!tmp.exists()) {
+      throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_tools_folder", folder)); 
+    }    
+    cmdlineTools = tmp;
 
     platformTools = new File(folder, "platform-tools");
     if (!platformTools.exists()) {
@@ -149,8 +152,18 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
       // First try the new location of the emulator inside its own folder
       emulator = findCliTool(emuFolder, "emulator");   
     } else {
-      // If not found, use old location inside tools
-      emulator = findCliTool(cmdlineTools, "emulator");
+      // If not found, use old location inside tools as fallback
+      emuFolder = new File(cmdlineTools, "emulator");
+      if (emuFolder.exists()) {
+        emulator = findCliTool(cmdlineTools, "emulator");  
+      } else {
+        emulator = null;
+        if (SDKDownloader.DOWNLOAD_EMU) {
+        // Only throw an exception if the downloader was supposed to download the emulator 
+        throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_emulator", 
+            AndroidBuild.TARGET_SDK, highestPlatform.getAbsolutePath()));
+        }
+      }      
     }
 
     String path = Platform.getenv("PATH");
@@ -285,10 +298,9 @@ public File getZipAlignTool() {
   // 10 just in case, having more does not cause any trouble.  
   private static final String response = "y\ny\ny\ny\ny\ny\ny\ny\ny\ny\n";
 
-  private void acceptLicenses() {
+  public void acceptLicenses() {
     final String[] cmd = new String[] {
         sdkManager.getAbsolutePath(),
-        "--sdk_root=", folder.getAbsolutePath(),
         "--licenses"
     };
 
@@ -489,7 +501,7 @@ static public AndroidSDK download(final Frame editor, final AndroidMode androidM
 
     final int result = showSDKLicenseDialog(editor);
     if (result == JOptionPane.YES_OPTION) {
-      sdk.acceptLicenses();   
+//      sdk.acceptLicenses();   
       String msg = AndroidMode.getTextString("android_sdk.dialog.sdk_installed_body", PROCESSING_FOR_ANDROID_URL, WHATS_NEW_URL);
       File driver = AndroidSDK.getGoogleDriverFolder();
       if (Platform.isWindows() && driver.exists()) {

mode/src/processing/mode/android/AndroidUtil.java

@@ -31,7 +31,9 @@
 import java.util.HashMap;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+ 
 import javax.swing.JEditorPane;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -295,5 +297,13 @@ static public boolean noFileExists(File[] files) {
       if (f.exists()) return false;  
     }
     return true;
-  } 
+  }
+  
+  static public void moveDir(File from, File to) {
+    try {
+      Files.move(from.toPath(), to.toPath(), StandardCopyOption.REPLACE_EXISTING);      
+    } catch (IOException ex) {
+      ex.printStackTrace();
+    }  
+  }
 }

mode/src/processing/mode/android/EmulatorController.java

@@ -75,6 +75,11 @@ synchronized public void launch(final AndroidSDK sdk, final boolean wear)
     String gpuFlag = "auto";
 
     final File emulator = sdk.getEmulatorTool();
+    if (emulator == null || emulator.exists()) {
+      System.err.println("EmulatorController: Emulator is not available.");
+      return;      
+    }
+    
     final String[] cmd = new String[] {
       emulator.getCanonicalPath(),
       "-avd", avdName,

mode/src/processing/mode/android/SDKDownloader.java

@@ -66,7 +66,7 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   private static final String REPOSITORY_LIST = "repository2-1.xml";
   private static final String ADDON_LIST = "addon2-1.xml";
 
-  private static final boolean DOWNLOAD_EMU = false;
+  public static final boolean DOWNLOAD_EMU = false;
 
   private JProgressBar progressBar;
   private JLabel downloadedTextArea;
@@ -133,23 +133,29 @@ protected Object doInBackground() throws Exception {
         getHaxmDownloadUrl(downloadUrls, haxmUrl, Platform.getName());
         firePropertyChange(AndroidMode.getTextString("download_property.change_event_total"), 0, downloadUrls.totalSize);
 
-        // command-line tools
+        // Command-line tools
         File downloadedCmdLineTools = new File(tempFolder, downloadUrls.cmdlineToolsFilename);
         downloadAndUnpack(downloadUrls.cmdlineToolsUrl, downloadedCmdLineTools, sdkFolder, true);
-
-        // platform-tools
+        File tmpFrom = new File(sdkFolder, "cmdline-tools");
+        File tmpTo = new File(sdkFolder, "cmdline-tmp");
+        AndroidUtil.moveDir(tmpFrom, tmpTo);
+        File cmdlineToolsFolder = new File(sdkFolder, "cmdline-tools/latest");
+        if (!cmdlineToolsFolder.exists()) cmdlineToolsFolder.mkdirs();        
+        AndroidUtil.moveDir(tmpTo, cmdlineToolsFolder);
+
+        // Platform tools
         File downloadedPlatformTools = new File(tempFolder, downloadUrls.platformToolsFilename);
         downloadAndUnpack(downloadUrls.platformToolsUrl, downloadedPlatformTools, sdkFolder, true);
 
-        // build-tools
+        // Build tools
         File downloadedBuildTools = new File(tempFolder, downloadUrls.buildToolsFilename);
         downloadAndUnpack(downloadUrls.buildToolsUrl, downloadedBuildTools, buildToolsFolder, true);
 
-        // platform
+        // Platform
         File downloadedPlatform = new File(tempFolder, downloadUrls.platformFilename);
         downloadAndUnpack(downloadUrls.platformUrl, downloadedPlatform, platformsFolder, false);
 
-        // usb driver
+        // USB driver
         if (Platform.isWindows()) {
           File downloadedFolder = new File(tempFolder, downloadUrls.usbDriverFilename);
           downloadAndUnpack(downloadUrls.usbDriverUrl, downloadedFolder, googleRepoFolder, false);
@@ -162,7 +168,7 @@ protected Object doInBackground() throws Exception {
         }
 
         if (DOWNLOAD_EMU) {
-          // emulator, unpacks directly to sdk folder 
+          // Emulator, unpacks directly to sdk folder 
           File downloadedEmulator = new File(tempFolder, downloadUrls.emulatorFilename);
           downloadAndUnpack(downloadUrls.emulatorUrl, downloadedEmulator, sdkFolder, true);          
         }