Merge pull request #548 from DeerajTheepshi/android-0274-v4.1.0-beta3

GSOC19 work from Deeraj

Author: codeanticode

mode/languages/mode.properties

@@ -88,7 +88,8 @@ android_mode.dialog.cannot_export_package_body = The sketch still has the defaul
 android_mode.dialog.cannot_use_default_icons_title = Cannot export package...
 android_mode.dialog.cannot_use_default_icons_body = The sketch does not include all required app icons. Processing could use its default set of Android icons, which are okay to test the app on your device, but a bad idea to distribute it on the Play store. Create a full set of unique icons for your app, and copy them into the sketch folder. Once you have done that, try exporting the sketch again.<br><br>For more info on distributing apps from Processing,<br>check <a href=\"%s\">this online tutorial</a>.
 android_mode.warn.cannot_load_sdk_title = Bad news...
-android_mode.warn.cannot_load_sdk_body = The Android SDK could not be loaded.\nThe Android Mode will be disabled.
+android_mode.warn.broken_sdk_folder = Your SDK path seems to be broken as %s
+android_mode.warn.cannot_load_sdk_body = The Android SDK could not be loaded, because:\n%s.\nThe Android Mode will be disabled.
 android_mode.info.cannot_open_sdk_path = "Android SDK path couldn't be opened.";
 android_mode.error.cannot_create_avd = "Could not create a virtual device for the emulator.";
 android_mode.dialog.no_devices_found_title = No devices found!
@@ -139,16 +140,17 @@ android_sdk.dialog.found_installed_sdk_body = Processing found a valid Android S
 android_sdk.option.use_existing_sdk = Use existing SDK
 android_sdk.option.download_new_sdk = Download new SDK
 android_sdk.dialog.cannot_find_sdk_title = Cannot find an Android SDK...
-android_sdk.dialog.cannot_find_sdk_body = Processing did not find an Android SDK on this computer. If there is one, and you know where it is, click \"Locate SDK path\" to select it, or \"Download SDK\" to let Processing download the SDK automatically.<br><br>If you want to download the SDK manually, you can get the command line tools from <a href=\"%s\">here</a>. Make sure to install the SDK platform for API %s.    
+android_sdk.dialog.cannot_find_sdk_body = Processing did not find an Android SDK on this computer. If there is one, and you know where it is, click \"Locate SDK path\" to select it, or \"Download SDK\" to let Processing download the SDK automatically.<br><br>If you want to download the SDK manually, you can get the command line tools from <a href=\"%s\">here</a>. Make sure to install the SDK platform for API 26 or higher.    
 android_sdk.dialog.invalid_sdk_title = Android SDK is not valid...
-android_sdk.dialog.invalid_sdk_body = Processing found an Android SDK, but is not valid. It could be missing some files, or might not be including the required platform for API %s.<br><br>If a valid SDK is available in a different location, click \"Locate SDK path\" to select it, or \"Download SDK\" to let Processing download the SDK automatically.<br><br>If you want to download the SDK manually, you can get the command line tools from <a href=\"%s\">here</a>. Make sure to install the SDK platform for API %s.
+android_sdk.dialog.invalid_sdk_body = Processing found an Android SDK, but is not valid. It could be missing some files, or might not be including the required platform for API 26 or higher.<br><br>If a valid SDK is available in a different location, click \"Locate SDK path\" to select it, or \"Download SDK\" to let Processing download the SDK automatically.<br><br>If you want to download the SDK manually, you can get the command line tools from <a href=\"%s\">here</a>. Make sure to install the SDK platform for API 26 or higher.
 android_sdk.option.download_sdk = Download SDK automatically
 android_sdk.option.locate_sdk = Locate SDK path manually
 android_sdk.dialog.download_phone_image_title = Download phone system image?
 android_sdk.dialog.download_phone_image_body = The system image needed by the emulator does not appear to be installed. Do you want Processing to download and install it now?
 android_sdk.dialog.download_watch_image_title = Download watch system image?
 android_sdk.dialog.download_watch_image_body = The system image needed by the emulator does not appear to be installed. Do you want Processing to download and install it now?
 android_sdk.dialog.select_sdk_folder = Choose the location of the Android SDK
+android_sdk.error.cancel_sdk_selection = User cancelled SDK path selection
 android_sdk.error.sdk_selection_canceled = User canceled attempt to find SDK
 android_sdk.error.sdk_download_canceled = User canceled SDK download
 android_sdk.error.sdk_download_failed = SDK could not be downloaded
@@ -172,7 +174,7 @@ android_sdk.error.missing_tools_folder = There is no tools folder in %s
 android_sdk.error.missing_platform_tools_folder = There is no platform-tools folder in %s
 android_sdk.error.missing_build_tools_folder = There is no build-tools folder in %s
 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_target_platform = There is no Android %s (or greater) in %s
 android_sdk.error.missing_android_jar = android.jar for plaform %s is missing from %s
 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.
@@ -259,6 +261,8 @@ sdk_downloader.error_cannot_find_emulator = Cannot find the emulator
 sdk_downloader.error.cannot_unpack_platform = Error unpacking platform to "%s"
 sdk_downloader.download_title = SDK download
 sdk_downloader.download_sdk_label = Downloading Android SDK...
+sdk_downloader.download_error_title = Incomplete download
+sdk_downloader.download_error_message = SDK Installation is incomplete due to: \n%s
 
 # ---------------------------------------
 # System image downloader

mode/src/processing/mode/android/AndroidMode.java

@@ -157,7 +157,17 @@ public void checkSDK(Editor editor) {
     if (userCancelledSDKSearch) return;
     checkingSDK = true;
     Throwable tr = null;
-    if (sdk == null) {      
+    Boolean broken = false;
+    if (sdk != null) { //when mode changes, sdk object is not recreated, this ensures that
+      try {
+        sdk = new AndroidSDK(sdk.getSdkFolder());
+      } catch (AndroidSDK.BadSDKException | IOException e) {
+        Messages.showWarning(AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_title"),
+                AndroidMode.getTextString("android_mode.warn.broken_sdk_folder",e.getMessage()));
+        broken = true;
+      }
+    }
+    if (sdk == null || broken) {
       try {
         sdk = AndroidSDK.load(true, editor);
         if (sdk == null) {
@@ -171,8 +181,8 @@ public void checkSDK(Editor editor) {
       }
     }
     if (sdk == null) {
-      Messages.showWarning(AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_title"), 
-                           AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_body"), tr);
+      Messages.showWarning(AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_title"),
+              AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_body",tr.getMessage()), tr);
     } else {
       Devices devices = Devices.getInstance();
       devices.setSDK(sdk);

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

@@ -92,6 +92,8 @@ class AndroidSDK {
   private static final int INVALID_SDK  = 3;
   private static int loadError = NO_ERROR;
 
+  private static boolean backOptionSelected;
+
   public AndroidSDK(File folder) throws BadSDKException, IOException {
     this.folder = folder;
     if (!folder.exists()) {
@@ -117,11 +119,17 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
     if (!platforms.exists()) {
       throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_platforms_folder", folder));
     }
-    
-    targetPlatform = new File(platforms, AndroidBuild.TARGET_PLATFORM);
+
+    String[] availPlatforms = platforms.list();
+    int maxVersion = 26;
+    for (String availPlatform:availPlatforms){
+      int platformVersion = Integer.parseInt(availPlatform.substring(availPlatform.length()-2));
+      if (platformVersion >= maxVersion) maxVersion = platformVersion;
+    }
+    targetPlatform = new File(platforms, "android-"+maxVersion);
     if (!targetPlatform.exists()) {
       throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_target_platform", 
-                                                          AndroidBuild.TARGET_SDK, platforms.getAbsolutePath()));
+                                                          maxVersion, platforms.getAbsolutePath()));
     }
 
     androidJar = new File(targetPlatform, "android.jar");
@@ -133,6 +141,8 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
     avdManager = findCliTool(new File(tools, "bin"), "avdmanager");
     sdkManager = findCliTool(new File(tools, "bin"), "sdkmanager");
 
+    Preferences.set("android.sdk.target",maxVersion+"");
+
     String path = Platform.getenv("PATH");
 
     Platform.setenv("ANDROID_SDK", folder.getCanonicalPath());
@@ -403,11 +413,17 @@ public static AndroidSDK load(boolean checkEnvSDK, Frame editor) throws IOExcept
 
   static public AndroidSDK locate(final Frame window, final AndroidMode androidMode)
       throws BadSDKException, CancelException, IOException {
-    
+    backOptionSelected = false;
+
     if (loadError == SKIP_ENV_SDK) {
       // The user does not want to use the environment SDK, so let's simply
       // download a new one to the sketchbook folder.
-      return download(window, androidMode);
+      AndroidSDK sdk = download(window, androidMode);
+      if(sdk==null && backOptionSelected){
+        return locate(window,androidMode);
+      } else {
+        return sdk;
+      }
     }
 
     // At this point, there is no ANDROID_SDK env variable, no SDK in the preferences,
@@ -416,7 +432,11 @@ static public AndroidSDK locate(final Frame window, final AndroidMode androidMod
     int result = showLocateDialog(window);
 
     if (result == JOptionPane.YES_OPTION) {
-      return download(window, androidMode);
+      AndroidSDK sdk = download(window, androidMode);
+      if(sdk==null && backOptionSelected){
+        return locate(window,androidMode);
+      }
+      return sdk;
     } else if (result == JOptionPane.NO_OPTION) {
       // User will manually select folder containing SDK folder
       File folder = selectFolder(AndroidMode.getTextString("android_sdk.dialog.select_sdk_folder"), null, window);
@@ -448,9 +468,13 @@ static public boolean locateSysImage(final Frame window,
   static public AndroidSDK download(final Frame editor, final AndroidMode androidMode) 
       throws BadSDKException, CancelException {
     final SDKDownloader downloader = new SDKDownloader(editor);    
-    downloader.run(); // This call blocks until the SDK download complete, or user cancels.
-    
-    if (downloader.cancelled()) {
+    //downloader.run(); // This call blocks until the SDK download complete, or user cancels.
+
+    if (downloader.isGoBack()){
+      backOptionSelected = true;
+      return null;
+    }
+    else if (downloader.cancelled()) {
       throw new CancelException(AndroidMode.getTextString("android_sdk.error.sdk_download_canceled"));  
     } 
     AndroidSDK sdk = downloader.getSDK();