From 7aee68f1fa60c4565361883511cd4eb490bc4929 Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Sat, 31 Oct 2020 12:01:18 +0100 Subject: Finish activity when Autofill Generate is cancelled (#1179) (cherry picked from commit 03959cca4d401487b6422cd0d650e7486af0b129) Signed-off-by: Harsh Shandilya --- CHANGELOG.md | 4 ++++ .../java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81cac0a2..c4e43b23 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. + ## [1.13.1] - 2020-10-23 ### Fixed 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) } } -- cgit v1.2.3