From 879ee013db43784ab160cb4e57924ea07b2dbe9d Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 5 Oct 2019 10:12:45 +0200 Subject: [PATCH] Fix multiple biometric menu #332 --- .../keepass/biometric/AdvancedUnlockedManager.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt index 2698d32cd..158e260df 100644 --- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt +++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt @@ -249,11 +249,18 @@ class AdvancedUnlockedManager(var context: FragmentActivity, biometricUnlockDatabaseHelper = null } + // Only to fix multiple fingerprint menu #332 + private var addBiometricMenuInProgress = false fun inflateOptionsMenu(menuInflater: MenuInflater, menu: Menu) { - cipherDatabaseAction.containsCipherDatabase(databaseFileUri) { - if ((biometricMode != Mode.UNAVAILABLE - && biometricMode != Mode.NOT_CONFIGURED) && it) - menuInflater.inflate(R.menu.advanced_unlock, menu) + if (!addBiometricMenuInProgress) { + addBiometricMenuInProgress = true + cipherDatabaseAction.containsCipherDatabase(databaseFileUri) { + if ((biometricMode != Mode.UNAVAILABLE && biometricMode != Mode.NOT_CONFIGURED) + && it) { + menuInflater.inflate(R.menu.advanced_unlock, menu) + addBiometricMenuInProgress = false + } + } } }