Merge branch 'master' of https://github.com/processing/processing-android

Author: Manindra29

mode.properties

@@ -4,7 +4,7 @@ url = https://github.com/processing/processing-android
 sentence = Create projects with Processing for Android devices
 paragraph = This version of the Android Mode is for Processing 3.0b4+
 imports=processing.mode.java.JavaMode
-version = 241
-prettyVersion = 3.0-alpha3
-minRevision = 242
+version = 242
+prettyVersion = 3.0-alpha4
+minRevision = 243
 maxRevision = 0

src/processing/mode/android/Manifest.java

@@ -93,7 +93,8 @@ public void setPackageName(String packageName) {
 
   public void setSdkTarget(String version) {
     XML usesSdk = xml.getChild("uses-sdk");
-    usesSdk.setString("android:minSdkVersion", version);
+    usesSdk.setString("android:minSdkVersion", "15");
+    usesSdk.setString("android:targetSdkVersion", version);
     save();
   }
 

src/processing/mode/android/SDKDownloader.java

@@ -23,6 +23,7 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.*;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Enumeration;
@@ -32,11 +33,11 @@
 @SuppressWarnings("serial")
 public class SDKDownloader extends JFrame implements PropertyChangeListener {
 
-  private static final String URL_REPOSITORY = "https://dl-ssl.google.com/android/repository/repository-10.xml";
+  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";
 
-  private static final String PLATFORM_API_LEVEL = "10";
+  private static final String PLATFORM_API_LEVEL = "22";
 
   public static final String PROPERTY_CHANGE_EVENT_TOTAL = "total";
   private static final String PROPERTY_CHANGE_EVENT_DOWNLOADED = "downloaded";
@@ -135,7 +136,19 @@ protected void done() {
 
     private void downloadAndUnpack(String urlString, File saveTo,
                                    File unpackTo) throws IOException {
-      URL url = new URL(urlString);
+      URL url = null;
+      try {
+        url = new URL(urlString);
+      } catch (MalformedURLException e) {
+    	  //This is expected for API level 14 and more
+    	  try {
+    		  url = new URL(URL_REPOSITORY_FOLDER + urlString);
+    	  } catch (MalformedURLException e1) {
+    		  //This exception is not expected. Need to return.
+    		  e1.printStackTrace();
+    		  return;
+    	  }
+      }
       URLConnection conn = url.openConnection();
 
       InputStream inputStream = conn.getInputStream();