Merge branch 'android-0274-v4.1.0-beta3' into GSoC19-p1.1

Author: DeerajTheepshi

mode/languages/mode.properties

@@ -259,6 +259,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

@@ -171,8 +171,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.getMessage()), tr);
+      Messages.showWarning(AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_title"),
+              AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_body"), 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()) {
@@ -411,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,
@@ -424,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);
@@ -456,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();