Finish activity when Autofill Generate is cancelled (#1179)

2 files changed, 7 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 449191c4..312bfb02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+-   Cancelling the Autofill "Generate password" action now correctly returns you to the original app.
+
 ### Changed
 
 -   Accessibility autofill has been removed completely due to being buggy, insecure and lacking in features. Upgrade to Android 8 or preferably later to gain access to our advanced Autofill implementation.
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt
index f4c296ee..bc012d3d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt
@@ -140,8 +140,10 @@ class AutofillSaveActivity : AppCompatActivity() {
                     Intent()
                 }
                 setResult(RESULT_OK, resultIntent)
-                finish()
+            } else {
+                setResult(RESULT_CANCELED)
             }
+            finish()
         }.launch(saveIntent)
     }
 }