From 6da747ce6f5561994f66dea1ba36bde44e6ca3ed Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Fri, 18 Dec 2020 10:06:38 +0100
Subject: [PATCH] Fix keyfile bug #820

---
 CHANGELOG                                                   | 2 +-
 .../kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt   | 6 +++---
 fastlane/metadata/android/en-US/changelogs/50.txt           | 2 +-
 fastlane/metadata/android/fr-FR/changelogs/50.txt           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2b3c7695c..3dab0ff73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
index fbec3d599..06c251f91 100644
--- 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() {
diff --git a/fastlane/metadata/android/en-US/changelogs/50.txt b/fastlane/metadata/android/en-US/changelogs/50.txt
index 42780ecb1..457eb4856 100644
--- a/fastlane/metadata/android/en-US/changelogs/50.txt
+++ b/fastlane/metadata/android/en-US/changelogs/50.txt
@@ -1 +1 @@
- *
\ No newline at end of file
+ * Fix KeyFile bug #820
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/50.txt b/fastlane/metadata/android/fr-FR/changelogs/50.txt
index 42780ecb1..45cc3d57d 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/50.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/50.txt
@@ -1 +1 @@
- *
\ No newline at end of file
+ * Correction du bug de fichier de clé #820
\ No newline at end of file