Disallow overwriting passwords when editing (#1286)

Co-authored-by: Aditya Wasan <[email protected]>
(cherry picked from commit 1f8db46)

Author: msfjarvis

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+-   Editing a password allowed accidentally overwriting an existing one
+
+
 ## [1.13.2] - 2020-12-20
 
 ### Added

app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt

@@ -397,7 +397,10 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB
                             runCatching {
                                 val file = File(path)
                                 // If we're not editing, this file should not already exist!
-                                if (!editing && file.exists()) {
+                                // Additionally, if we were editing and the incoming and outgoing
+                                // filenames differ, it means we renamed. Ensure that the target
+                                // doesn't already exist to prevent an accidental overwrite.
+                                if ((!editing || (editing && suggestedName != file.nameWithoutExtension)) && file.exists()) {
                                     snackbar(message = getString(R.string.password_creation_duplicate_error))
                                     return@executeApiAsync
                                 }