Merge pull request #66 from imilka/bugfixes

Bugfixes

Author: codeanticode

src/processing/mode/android/AVD.java

@@ -1,13 +1,13 @@
 package processing.mode.android;
 
-import java.io.IOException;
-import java.util.ArrayList;
-
 import processing.app.Base;
 import processing.app.exec.ProcessHelper;
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
 
+import java.io.IOException;
+import java.util.ArrayList;
+
 
 public class AVD {
   static private final String AVD_CREATE_PRIMARY =
@@ -137,7 +137,8 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       "-n", name, 
       "-t", target,
       "-c", DEFAULT_SDCARD_SIZE,
-      "-s", DEFAULT_SKIN
+      "-s", DEFAULT_SKIN,
+      "--abi", "armeabi"
     };
 
     // Set the list to null so that exists() will check again

src/processing/mode/android/AndroidBuild.java

@@ -350,7 +350,10 @@ private File signPackage(File projectFolder, String keyStorePassword) throws Exc
   } */
 
   private File zipalignPackage(File signedPackage, File projectFolder) throws IOException, InterruptedException {
-    String zipalignPath = sdk.getSdkFolder().getAbsolutePath() + "/tools/zipalign";
+
+    File buildToolsFolder = new File(sdk.getSdkFolder(), "build-tools").listFiles()[0];
+    String zipalignPath = buildToolsFolder.getAbsolutePath() + "/zipalign";
+
     File alignedPackage = new File(projectFolder, "bin/" + sketch.getName() + "-release-signed-aligned.apk");
 
     String[] args = {

src/processing/mode/android/AndroidRunner.java

@@ -72,7 +72,7 @@ public void launch(Future<Device> deviceFuture) {
 //  monitor.setNote("Installing sketch on " + device.getId());
     listener.statusNotice("Installing sketch on " + device.getId());
     // this stopped working with Android SDK tools revision 17
-    if (!device.installApp(build.getPathForAPK(), listener)) {
+    if (!device.installApp(build, listener)) {
       listener.statusError("Lost connection with device while installing. Try again.");
       Devices.killAdbServer();  // see above
       return;

src/processing/mode/android/Device.java

@@ -78,13 +78,13 @@ public String getName() {
   // Success
 
   // safe to just always include the -r (reinstall) flag
-  public boolean installApp(final String apkPath, final RunnerListener status) {
+  public boolean installApp(final AndroidBuild build, final RunnerListener status) {
     if (!isAlive()) {
       return false;
     }
     bringLauncherToFront();
     try {
-      final ProcessResult installResult = adb("install", "-r", apkPath);
+      final ProcessResult installResult = adb("install", "-r", build.getPathForAPK());
       if (!installResult.succeeded()) {
         status.statusError("Could not install the sketch.");
         System.err.println(installResult);
@@ -94,6 +94,12 @@ public boolean installApp(final String apkPath, final RunnerListener status) {
       for (final String line : installResult) {
         if (line.startsWith("Failure")) {
           errorMsg = line.substring(8);
+
+          if(line.contains("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES")) {
+            boolean removeResult = removeApp(build.getPackageName());
+            if(removeResult) return installApp(build, status);
+          }
+
           System.err.println(line);
         }
       }
@@ -109,6 +115,16 @@ public boolean installApp(final String apkPath, final RunnerListener status) {
     return false;
   }
 
+  public boolean removeApp(String packageName) throws IOException, InterruptedException {
+    final ProcessResult removeResult = adb("uninstall", packageName);
+
+    if (!removeResult.succeeded()) {
+      return false;
+    }
+
+    return true;
+  }
+
 
   // different version that actually runs through JDI:
   // http://asantoso.wordpress.com/2009/09/26/using-jdb-with-adb-to-debugging-of-android-app-on-a-real-device/

src/processing/mode/android/SDKDownloader.java

@@ -98,6 +98,7 @@ protected Object doInBackground() throws Exception {
         tempFolder.delete();
 
         Base.getPlatform().setenv("ANDROID_SDK", sdkFolder.getAbsolutePath());
+        Preferences.set("android.sdk.path", sdkFolder.getAbsolutePath());
         androidMode.loadSDK();
       } catch (ParserConfigurationException e) {
         // TODO Handle exceptions here somehow (ie show error message) and handle at least mkdir() results (above)