Handle missing keystore

processing · Apr 18, 2022 · 9130cce · 9130cce
1 parent 62070db
commit 9130cce
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/mode/src/processing/mode/android/AndroidBuild.java b/mode/src/processing/mode/android/AndroidBuild.java
@@ -362,9 +362,11 @@ private void createTopModule(String projectModules, String keyPassword)
     File gradlePropsTemplate = mode.getContentFile("templates/" + GRADLE_PROPERTIES_TEMPLATE);
     File gradlePropsFile = new File(tmpFolder, "gradle.properties");
     replaceMap.clear();
-    replaceMap.put("@@keystore_file@@", AndroidKeyStore.getKeyStore().getAbsolutePath());
-    replaceMap.put("@@key_alias@@", AndroidKeyStore.ALIAS_STRING);
-    replaceMap.put("@@key_password@@", keyPassword);
+    if (!keyPassword.equals("") && AndroidKeyStore.getKeyStore() != null) {
+      replaceMap.put("@@keystore_file@@", AndroidKeyStore.getKeyStore().getAbsolutePath());
+      replaceMap.put("@@key_alias@@", AndroidKeyStore.ALIAS_STRING);  
+      replaceMap.put("@@key_password@@", keyPassword);
+    }
     AndroidUtil.createFileFromTemplate(gradlePropsTemplate, gradlePropsFile, replaceMap);    
 
     File settingsTemplate = mode.getContentFile("templates/" + GRADLE_SETTINGS_TEMPLATE);