fixed SDK download, simplified target setting

Author: codeanticode

src/processing/mode/android/AVD.java

@@ -203,7 +203,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 	  }
 	} catch (InterruptedException e) {}
 
-	if (preferredAbi.get(AndroidBuild.target_api_level) == null) {
+	if (preferredAbi.get(AndroidBuild.target_sdk) == null) {
 	  return false;
 	}
 
@@ -214,7 +214,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       "-t", target,
       "-c", DEFAULT_SDCARD_SIZE,
       "-s", DEFAULT_SKIN,
-      "--abi", preferredAbi.get(AndroidBuild.target_api_level)
+      "--abi", preferredAbi.get(AndroidBuild.target_sdk)
     };
 
     // Set the list to null so that exists() will check again
@@ -267,7 +267,7 @@ static public boolean ensureProperAVD(final AndroidSDK sdk) {
 //      Base.showWarning("Android Error", AVD_CREATE_ERROR, e);
       Messages.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
                                  String.format(AVD_CREATE_SECONDARY,
-                                               AndroidBuild.target_api_level), null);
+                                               AndroidBuild.target_sdk), null);
     }
     return false;
   }

src/processing/mode/android/AndroidBuild.java

@@ -66,9 +66,8 @@ class AndroidBuild extends JavaBuild {
   static public final String min_sdk_watchface = "21"; // Lollipop (5.0)
 
   // Hard-coded target SDK, no longer user-selected.
-  static public final String target_sdk_version = "5.1"; // Lollipop
-  static public final String target_api_level   = "22";  
-  static public final String target_platform    = "android-" + target_api_level;
+  static public final String target_sdk      = "22";  // Lollipop (5.1)
+  static public final String target_platform = "android-" + target_sdk;
 
   static public int appComponent = FRAGMENT;
   static boolean forceNewManifest = false;
@@ -173,7 +172,7 @@ public File createProject() throws IOException, SketchException {
     }
 
     manifest = new Manifest(sketch);
-    manifest.setSdkTarget(target_api_level);
+    manifest.setSdkTarget(target_sdk);
     forceNewManifest = false;
 
     // grab code from current editing window (GUI only)
@@ -275,7 +274,7 @@ public File createProject() throws IOException, SketchException {
             }
 
             if (platform != null && platform.equals(target_platform) &&
-                api != null && api.equals(target_api_level)) {
+                api != null && api.equals(target_sdk)) {
               targetID = id;
               break;
             }            
@@ -769,10 +768,9 @@ void antBuildProblems(String outPile, String errPile) throws SketchException {
       if (line.contains("Unable to resolve target '" + target_platform + "'")) {
         System.err.println("Use the Android SDK Manager (under the Android");
         System.err.println("menu) to install the SDK platform and ");
-        System.err.println("Google APIs for Android " + target_sdk_version +
-                           " (API " + target_api_level + ")");
+        System.err.println("Google APIs for Android " + target_sdk);
         skex = new SketchException("Please install the SDK platform and " +
-                                   "Google APIs for API " + target_api_level);
+                                   "Google APIs for Android " + target_sdk);
       }
     }
     // Stack trace is not relevant, just the message.

src/processing/mode/android/AndroidMode.java

@@ -39,6 +39,8 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -201,8 +203,16 @@ public String getSearchPath() {
       return "";
     }
 
-    String path = sdk.getSdkFolder().getAbsolutePath() + File.separator + 
-                  "platforms" + File.separator + "android-";
+    /*
+    Path path = Paths.get(sdk.getSdkFolder().getAbsolutePath(), 
+                          "platforms", AndroidBuild.target_platform, 
+                          "android.jar").toAbsolutePath();
+        
+//    String path = new File().getAbsolutePath(); 
+//        
+//        
+//        sdk.getSdkFolder().getAbsolutePath() + File.separator + 
+//                  "platforms" + File.separator + "android-";
     String level = AndroidBuild.target_api_level;
     String name = AndroidBuild.target_sdk_version;
     String androidJarPath = path + level + File.separator + "android.jar";    
@@ -214,9 +224,10 @@ public String getSearchPath() {
         return "";        
       }
     }
+    */
 
-    String processingAndroidCoreJarPath = new File(getFolder(), "android-core.zip").getAbsolutePath();
-    return androidJarPath + File.pathSeparatorChar + processingAndroidCoreJarPath;
+    String coreJarPath = new File(getFolder(), "android-core.zip").getAbsolutePath();
+    return sdk.getAndroidJarPath().getAbsolutePath() + File.pathSeparatorChar + coreJarPath;
   }
 
 

src/processing/mode/android/AndroidSDK.java

@@ -45,6 +45,7 @@ class AndroidSDK {
   private final File tools;
   private final File platforms;
   private final File targetPlatform;
+  private final File androidJar;
   private final File platformTools;
   private final File androidTool;
 
@@ -60,8 +61,7 @@ class AndroidSDK {
     "If you want to download the SDK manually, you can visit <br>"+
     "http://developer.android.com/sdk/installing/index.html <br>" +
     "and select the stand-alone SDK tools. Make sure to install <br>"+
-    "the SDK platform for Android " + AndroidBuild.target_sdk_version + 
-    " (API level " + AndroidBuild.target_api_level + ") or higher.";
+    "the SDK platform for API " + AndroidBuild.target_sdk + ".";
 
   private static final String SELECT_ANDROID_SDK_FOLDER =
     "Choose the location of the Android SDK";
@@ -90,9 +90,15 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
     targetPlatform = new File(platforms, AndroidBuild.target_platform);
     if (!targetPlatform.exists()) {
       throw new BadSDKException("There is no Android " + 
-                                AndroidBuild.target_sdk_version + " in " + platforms.getAbsolutePath());
+                                AndroidBuild.target_sdk + " in " + platforms.getAbsolutePath());
     }
 
+    androidJar = new File(targetPlatform, "android.jar");
+    if (!androidJar.exists()) {
+      throw new BadSDKException("android.jar for plaform " + 
+                                AndroidBuild.target_sdk + " is missing from " + targetPlatform.getAbsolutePath());
+    }
+    
     androidTool = findAndroidTool(tools);
 
     String path = Platform.getenv("PATH");
@@ -182,6 +188,11 @@ public File getSdkFolder() {
   }
 
 
+  public File getAndroidJarPath() {
+    return androidJar;  
+  }
+  
+  
   public File getPlatformToolsFolder() {
     return platformTools;
   }

src/processing/mode/android/SDKDownloader.java

@@ -49,11 +49,6 @@
 
 @SuppressWarnings("serial")
 public class SDKDownloader extends JDialog implements PropertyChangeListener {
-  // Version and API level are both used to avoid ambiguity with preview versions,
-  // which might share the API level with the earlier stable platform.
-  private static final String PLATFORM_VERSION = "6.0";
-  private static final String PLATFORM_API_LEVEL = "23";
-  
   private static final String URL_REPOSITORY = "https://dl-ssl.google.com/android/repository/repository-11.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";
@@ -74,6 +69,7 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   private int totalSize = 0;  
 
   class SDKUrlHolder {
+    public String platformVersion;
     public String platformToolsUrl, buildToolsUrl, platformUrl, toolsUrl;
     public String platformToolsFilename, buildToolsFilename, platformFilename, toolsFilename;
     public int totalSize = 0;
@@ -128,7 +124,7 @@ protected Object doInBackground() throws Exception {
         // platform
         File downloadedPlatform = new File(tempFolder, downloadUrls.platformFilename);
         downloadAndUnpack(downloadUrls.platformUrl, downloadedPlatform, platformsFolder, false);
-
+        
         // usb driver
         if (Platform.isWindows()) {
           File usbDriverFolder = new File(extrasFolder, "google");
@@ -142,6 +138,17 @@ protected Object doInBackground() throws Exception {
 
         tempFolder.delete();
 
+        // Normalize platform folder to android-<API LEVEL>
+        File expectedPath = new File(platformsFolder, "android-" + AndroidBuild.target_sdk);
+        File actualPath = new File(platformsFolder, "android-" + downloadUrls.platformVersion);
+        if (!expectedPath.exists()) {
+          if (actualPath.exists()) {
+            actualPath.renameTo(expectedPath);
+          } else {
+            throw new IOException("Error unpacking platform to " + actualPath.getAbsolutePath());
+          }
+        }
+        
         // Done, let's set the environment and load the new SDK!
         Platform.setenv("ANDROID_SDK", sdkFolder.getAbsolutePath());
         Preferences.set("android.sdk.path", sdkFolder.getAbsolutePath());        
@@ -209,14 +216,21 @@ private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs
       Document doc = db.parse(new URL(repositoryUrl).openStream());
 
       // platform
+      String platformDescription = "Android SDK Platform " +  AndroidBuild.target_sdk;
       NodeList platformList = doc.getElementsByTagName("sdk:platform");
       for (int i = 0; i < platformList.getLength(); i++) {
         Node platform = platformList.item(i);
         NodeList version = ((Element) platform).getElementsByTagName("sdk:version");
         NodeList level = ((Element) platform).getElementsByTagName("sdk:api-level");
-        if (version.item(0).getTextContent().equals(PLATFORM_VERSION) && level.item(0).getTextContent().equals(PLATFORM_API_LEVEL)) {
+        NodeList desc = ((Element) platform).getElementsByTagName("sdk:description");
+        // API level and platform description are both used to avoid ambiguity with 
+        // preview versions, which might share the API level with the earlier stable 
+        // platform, but use the letter codename in their description.        
+        if (level.item(0).getTextContent().equals( AndroidBuild.target_sdk) && 
+            desc.item(0).getTextContent().equals(platformDescription)) {
           Node archiveListItem = ((Element) platform).getElementsByTagName("sdk:archives").item(0);
           Node archiveItem = ((Element) archiveListItem).getElementsByTagName("sdk:archive").item(0);
+          urlHolder.platformVersion = version.item(0).getTextContent();
           urlHolder.platformUrl = ((Element) archiveItem).getElementsByTagName("sdk:url").item(0).getTextContent();
           urlHolder.platformFilename = urlHolder.platformUrl.split("/")[urlHolder.platformUrl.split("/").length-1];
           urlHolder.totalSize += Integer.parseInt(((Element) archiveItem).getElementsByTagName("sdk:size").item(0).getTextContent());