remove key password from gradle.properties file after building bundle/package

Author: codeanticode

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

@@ -215,7 +215,7 @@ public File build(String target, String password) throws IOException, SketchExce
     this.target = target;        
     File folder = createProject(true, password);
     if (folder == null) return null;
-    if (!gradleBuild()) return null;
+    if (!gradleBuildPackage()) return null;
     return folder;      
   }
 
@@ -291,11 +291,17 @@ protected boolean gradleBuildBundle() throws SketchException {
       connection.close();
     }
 
+    try {
+      removeKeyPassword();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+
     return success;
   }
 
 
-  protected boolean gradleBuild() throws SketchException {
+  protected boolean gradleBuildPackage() throws SketchException {
     ProjectConnection connection = GradleConnector.newConnector()
             .forProjectDirectory(tmpFolder)
             .connect();
@@ -330,6 +336,12 @@ protected boolean gradleBuild() throws SketchException {
       connection.close();
     }
 
+    try {
+      removeKeyPassword();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+
     return success;
   }
 
@@ -353,9 +365,7 @@ private void createTopModule(String projectModules, String keyPassword)
     replaceMap.put("@@keystore_file@@", AndroidKeyStore.getKeyStore().getAbsolutePath());
     replaceMap.put("@@key_alias@@", AndroidKeyStore.ALIAS_STRING);
     replaceMap.put("@@key_password@@", keyPassword);
-
-    AndroidUtil.createFileFromTemplate(gradlePropsTemplate, gradlePropsFile, replaceMap);
-    // Util.copyFile(gradlePropsTemplate, gradlePropsFile);
+    AndroidUtil.createFileFromTemplate(gradlePropsTemplate, gradlePropsFile, replaceMap);    
 
     File settingsTemplate = mode.getContentFile("templates/" + GRADLE_SETTINGS_TEMPLATE);
     File settingsFile = new File(tmpFolder, "settings.gradle");
@@ -744,9 +754,6 @@ public File exportBundle(String keyStorePassword) throws Exception {
     File projectFolder = buildBundle("release", keyStorePassword);
     if (projectFolder == null) return null;
 
-    // File signedPackage = signPackage(projectFolder, keyStorePassword, "aab");
-    // if (signedPackage == null) return null;
-
     // Final export folder
     File exportFolder = createExportFolder("buildBundle");
     Util.copyDir(new File(projectFolder, getPathToAAB()), exportFolder);
@@ -762,9 +769,6 @@ public File exportPackage(String keyStorePassword) throws Exception {
     File projectFolder = build("release", keyStorePassword);
     if (projectFolder == null) return null;
 
-    // File signedPackage = signPackage(projectFolder, keyStorePassword, "apk");
-    // if (signedPackage == null) return null;
-
     // Final export folder
     File exportFolder = createExportFolder("buildPackage");
     Util.copyDir(new File(projectFolder, getPathToAPK()), exportFolder);    
@@ -975,6 +979,13 @@ private void renameAPK() {
     }
   }  
 
+
+  private void removeKeyPassword() throws IOException {
+    File gradlePropsTemplate = mode.getContentFile("templates/" + GRADLE_PROPERTIES_TEMPLATE);
+    File gradlePropsFile = new File(tmpFolder, "gradle.properties");
+    Util.copyFile(gradlePropsTemplate, gradlePropsFile);
+  }
+
 
   private String getPathToAPK() {
     return module + "/build/outputs/apk/" + target + "/";

mode/src/processing/mode/android/AndroidEditor.java

@@ -523,7 +523,6 @@ public void run() {
         try {
           File projectFolder = build.exportBundle(keyStorePassword);
           if (projectFolder != null) {
-
             statusNotice(AndroidMode.getTextString("android_editor.status.bundle_export_completed"));
             Platform.openFolder(projectFolder);
           } else {