some minor code refactor

Author: codeanticode

mode/src/processing/mode/android/AndroidBuild.java

@@ -770,28 +770,31 @@ private File signPackage(File projectFolder, String keyStorePassword, String fil
     File keyStore = AndroidKeyStore.getKeyStore();
     if (keyStore == null) return null;
 
-    String path=getPathToAPK();
-    if (fileExt.equals("aab")) {
+    String path;
+    boolean isAAB = fileExt.equals("aab");
+    if (isAAB) {
       path = getPathToAAB();
+    } else {
+      path = getPathToAPK();
     }
-      File unsignedPackage = new File(projectFolder,
-              path + sketch.getName().toLowerCase() + "_release_unsigned." + fileExt);
-      if (!unsignedPackage.exists()) return null;
-      File signedPackage = new File(projectFolder,
-              path + sketch.getName().toLowerCase() + "_release_signed." + fileExt);
 
+    File unsignedPackage = new File(projectFolder,
+                                    path + sketch.getName().toLowerCase() + "_release_unsigned." + fileExt);
+    if (!unsignedPackage.exists()) return null;
+    File signedPackage = new File(projectFolder,
+                                  path + sketch.getName().toLowerCase() + "_release_signed." + fileExt);
 
-    JarSigner.signJar(unsignedPackage, signedPackage, 
+    JarSigner.signJarV1(unsignedPackage, signedPackage, 
         AndroidKeyStore.ALIAS_STRING, keyStorePassword, 
         keyStore.getAbsolutePath(), keyStorePassword);
 
-    if (fileExt.equals("aab")) {
+    if (isAAB) {
       return signedPackage;
+    } else {
+      File alignedPackage = zipalignPackage(signedPackage, projectFolder, fileExt);
+      return alignedPackage;  
     }
-    File alignedPackage = zipalignPackage(signedPackage, projectFolder, fileExt);
-    return alignedPackage;
   }
-
 
   private File zipalignPackage(File signedPackage, File projectFolder, String fileExt)
       throws IOException, InterruptedException {
@@ -801,7 +804,6 @@ private File zipalignPackage(File signedPackage, File projectFolder, String file
                            AndroidMode.getTextString("android_build.warn.cannot_find_zipalign.body"));
       return null;
     }
-
 
     File alignedPackage = new File(projectFolder, 
         getPathToAPK() + sketch.getName().toLowerCase() + "_release_signed_aligned."+fileExt);

mode/src/processing/mode/android/JarSigner.java

@@ -52,7 +52,7 @@ public class JarSigner {
   private static SignatureOutputStream certFileContents = null;
   private static byte[] buffer;
 
-  public static void signJar(File jarToSign, File outputJar, String alias, 
+  public static void signJarV1(File jarToSign, File outputJar, String alias, 
       String keypass, String keystore, String storepass)
       throws GeneralSecurityException, IOException, NoSuchAlgorithmException {