From 32549c9eff39fd516d9091eccaa3f4b96d1c72ae Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Wed, 6 Nov 2019 19:31:57 +0100 Subject: [PATCH] make sure biometric prompt does not show up directly after authentication (into 1.08-pre3) --- src/keepass2android/PasswordActivity.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs index 360dc6b8..15205122 100644 --- a/src/keepass2android/PasswordActivity.cs +++ b/src/keepass2android/PasswordActivity.cs @@ -1503,7 +1503,10 @@ namespace keepass2android base.OnPause(); } - protected override void OnStart() + private bool fingerprintInitialized; + + + protected override void OnStart() { base.OnStart(); _starting = true; @@ -1515,9 +1518,14 @@ namespace keepass2android } DonateReminder.ShowDonateReminderIfAppropriate(this); - - - } + + + if (compositeKeyForImmediateLoad == null && !fingerprintInitialized) + { + fingerprintInitialized = InitFingerprintUnlock(); + } + + } private MemoryStream PreloadDbFile() { @@ -1747,7 +1755,7 @@ namespace keepass2android bool showKeyboard = (Util.GetShowKeyboardDuringFingerprintUnlock(this)); - if (!InitFingerprintUnlock()) + if (!fingerprintInitialized) showKeyboard = true;