summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Henneke <FabianHenneke@users.noreply.github.com>2020-10-31 12:01:18 +0100
committerHarsh Shandilya <me@msfjarvis.dev>2020-12-21 20:16:10 +0530
commit7aee68f1fa60c4565361883511cd4eb490bc4929 (patch)
treeb8e2ca84dbeb5a2f71feebb3150ff30cf429f8a9
parent5cfa1f165f1905cd6dbe4fa7bfca1593672a7322 (diff)
Finish activity when Autofill Generate is cancelled (#1179)
(cherry picked from commit 03959cca4d401487b6422cd0d650e7486af0b129) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--CHANGELOG.md4
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt4
2 files changed, 7 insertions, 1 deletions
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)
}
}