PasswordCreationActivity: properly guard rename code

msfjarvis · FabianHenneke · commit a0b6f48b504b · 2020-06-21T07:17:34.000+02:00
Signed-off-by: Harsh Shandilya &lt;me@msfjarvis.dev&gt;
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt
@@ -286,7 +286,7 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB
                                 }
                             }
 
-                            if (category.isVisible && category.isEnabled) {
+                            if (category.isVisible && category.isEnabled && oldFileName != null) {
                                 val oldFile = File("$repoPath/${oldCategory?.trim('/')}/$oldFileName.gpg")
                                 if (oldFile.path != file.path && !oldFile.delete()) {
                                     setResult(RESULT_CANCELED)

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB`
`286`	`286`	`}`
`287`	`287`	`}`
`288`	`288`
`289`		`- if (category.isVisible && category.isEnabled) {`
	`289`	`+ if (category.isVisible && category.isEnabled && oldFileName != null) {`
`290`	`290`	`val oldFile = File("$repoPath/${oldCategory?.trim('/')}/$oldFileName.gpg")`
`291`	`291`	`if (oldFile.path != file.path && !oldFile.delete()) {`
`292`	`292`	`setResult(RESULT_CANCELED)`