Merge pull request #6 from DeerajTheepshi/GSoC19-p1.1

[FIX] Locate SDK-Check for any platform > 26

Author: DeerajTheepshi

mode/languages/mode.properties

@@ -88,7 +88,7 @@ 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.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,9 +139,9 @@ 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?
@@ -172,7 +172,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.

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

@@ -119,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");
@@ -135,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());