Fix keyfile bug #820

2025-12-04 15:49:33 +01:00 · 2020-12-18 10:06:38 +01:00
parent 428b53cc56
commit 6da747ce6f
4 changed files with 6 additions and 6 deletions
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 KeePassDX(2.9.6)
- *
+ * Fix KeyFile bug #820

 KeePassDX(2.9.5)
 * Unlock database by device credentials (PIN/Password/Pattern) with Android M+ #102 #152 #811
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
@@ -117,10 +117,10 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        // To wait resume
-        activityResult = ActivityResult(requestCode, resultCode, data)
+        if (keepConnection) {
+            activityResult = ActivityResult(requestCode, resultCode, data)
+        }
        keepConnection = false
-
-        super.onActivityResult(requestCode, resultCode, data)
    }

    override fun onResume() {
--- a/fastlane/metadata/android/en-US/changelogs/50.txt
+++ b/fastlane/metadata/android/en-US/changelogs/50.txt
@@ -1 +1 @@
- *
+ * Fix KeyFile bug #820
--- a/fastlane/metadata/android/fr-FR/changelogs/50.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/50.txt
@@ -1 +1 @@
- *
+ * Correction du bug de fichier de clé #820