Use ant tools for signing

Author: imilka

build.xml

@@ -45,8 +45,7 @@
 		      ${processing.dir}/app/pde.jar;
 		      ${processing.dir}/app/lib/ant.jar;
 		      ${processing.dir}/app/lib/ant-launcher.jar;
-		      ${processing.dir}/app/lib/antlr.jar;
-              ${tools.jar.path}"
+		      ${processing.dir}/app/lib/antlr.jar"
 	   debug="on">
       <src path="src" />
     </javac>

mode/tools.jar

@@ -33,7 +33,6 @@
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
 import processing.mode.java.JavaBuild;
-import sun.security.tools.JarSigner;
 
 import java.io.*;
 import java.security.Permission;
@@ -294,52 +293,36 @@ private File signPackage(File projectFolder, String keyStorePassword) throws Exc
     File unsignedPackage = new File(projectFolder, "bin/" + sketch.getName() + "-release-unsigned.apk");
     if(!unsignedPackage.exists()) return null;
 
-    String[] args = {
-        "-sigalg", "SHA1withRSA",
-        "-digestalg", "SHA1",
-        "-keypass", keyStorePassword,
-        "-storepass", keyStorePassword,
-        "-keystore", keyStore.getCanonicalPath(),
-        unsignedPackage.getCanonicalPath(),
-        AndroidKeyStore.ALIAS_STRING
-    };
-
-    // TODO remove hardcoded tools.jar path from build.xml
+    JarSigner.signJar(unsignedPackage, AndroidKeyStore.ALIAS_STRING, keyStorePassword, keyStore.getAbsolutePath(), keyStorePassword);
 
-    SystemExitControl.forbidSystemExitCall();
-    try {
-      JarSigner.main(args);
-    } catch (SystemExitControl.ExitTrappedException ignored) { }
-    SystemExitControl.enableSystemExitCall();
-
-    if(verifySignedPackage(unsignedPackage)) {
-      File signedPackage = new File(projectFolder, "bin/" + sketch.getName() + "-release-signed.apk");
-      if(signedPackage.exists()) {
-        boolean deleteResult = signedPackage.delete();
-        if(!deleteResult) {
-          Base.showWarning("Error during package signing",
-              "Unable to delete old signed package");
-          return null;
-        }
-      }
-
-      boolean renameResult = unsignedPackage.renameTo(signedPackage);
-      if(!renameResult) {
+    //if(verifySignedPackage(unsignedPackage)) {
+    File signedPackage = new File(projectFolder, "bin/" + sketch.getName() + "-release-signed.apk");
+    if(signedPackage.exists()) {
+      boolean deleteResult = signedPackage.delete();
+      if(!deleteResult) {
         Base.showWarning("Error during package signing",
-            "Unable to rename package file");
+            "Unable to delete old signed package");
         return null;
       }
+    }
 
-      File alignedPackage = zipalignPackage(signedPackage, projectFolder);
-      return alignedPackage;
-    } else {
+    boolean renameResult = unsignedPackage.renameTo(signedPackage);
+    if(!renameResult) {
       Base.showWarning("Error during package signing",
-          "Verification of the signed package has failed");
+          "Unable to rename package file");
       return null;
     }
+
+    File alignedPackage = zipalignPackage(signedPackage, projectFolder);
+    return alignedPackage;
+    /*} else {
+      Base.showWarning("Error during package signing",
+          "Verification of the signed package has failed");
+      return null;
+    }*/
   }
 
-  private boolean verifySignedPackage(File signedPackage) throws Exception {
+  /*private boolean verifySignedPackage(File signedPackage) throws Exception {
     String[] args = {
         "-verify", signedPackage.getCanonicalPath()
     };
@@ -363,7 +346,7 @@ private boolean verifySignedPackage(File signedPackage) throws Exception {
     printStream.close();
 
     return result.contains("verified");
-  }
+  } */
 
   private File zipalignPackage(File signedPackage, File projectFolder) throws IOException, InterruptedException {
     String zipalignPath = sdk.getSdkFolder().getAbsolutePath() + "/tools/zipalign";

src/processing/mode/android/AndroidBuild.java

@@ -1,7 +1,6 @@
 package processing.mode.android;
 
 import processing.app.Base;
-import sun.security.tools.KeyTool;
 
 import java.io.File;
 
@@ -50,7 +49,9 @@ public static void generateKeyStore(String password,
         parseDnameField(locality), parseDnameField(state), parseDnameField(country));
 
     String[] args = {
-        "-genkey",
+        System.getProperty("java.home")
+            + System.getProperty("file.separator") + "bin"
+            + System.getProperty("file.separator") + "keytool", "-genkey",
         "-keystore", getKeyStoreLocation().getAbsolutePath(),
         "-alias", ALIAS_STRING,
         "-keyalg", "RSA",
@@ -61,7 +62,8 @@ public static void generateKeyStore(String password,
         "-dname", dname
     };
 
-    KeyTool.main(args);
+    Process generation = Runtime.getRuntime().exec(args);
+    generation.waitFor();
 
     if(getKeyStore() == null) throw new Exception();
   }

src/processing/mode/android/AndroidKeyStore.java

@@ -0,0 +1,29 @@
+package processing.mode.android;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.apache.tools.ant.taskdefs.SignJar;
+
+import java.io.File;
+
+public class JarSigner extends SignJar {
+
+  public JarSigner() {
+    setProject(new Project());
+    getProject().init();
+    setTaskName("signJar");
+    setTaskType("signJar");
+    setOwningTarget(new Target());
+  }
+
+  public static void signJar(File jarToSign, String alias, String keypass, String keystore, String storepass) {
+    JarSigner signer = new JarSigner();
+    signer.setJar(jarToSign);
+    signer.setAlias(alias);
+    signer.setKeypass(keypass);
+    signer.setKeystore(keystore);
+    signer.setStorepass(storepass);
+    signer.setSignedjar(jarToSign);
+    signer.execute();
+  }
+}