From 8a0501f0f9aaf9b8cf932e83ac18ac62a3c1532e Mon Sep 17 00:00:00 2001
From: Federico Maccaroni <fedemkr@gmail.com>
Date: Wed, 17 Apr 2024 17:41:49 -0300
Subject: [PATCH] PM-7365 Fix UserVerification on Fido2 credential creation on
 Android by updating the HasUnlockedInThisTransaction flag when a new
 transaction starts. (#3168)

---
 src/App/Platforms/Android/MainActivity.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/App/Platforms/Android/MainActivity.cs b/src/App/Platforms/Android/MainActivity.cs
index 741b970d6..441b8d309 100644
--- a/src/App/Platforms/Android/MainActivity.cs
+++ b/src/App/Platforms/Android/MainActivity.cs
@@ -168,6 +168,13 @@ namespace Bit.Droid
             base.OnNewIntent(intent);
             try
             {
+                if (intent?.GetStringExtra(CredentialProviderConstants.Fido2CredentialAction) == CredentialProviderConstants.Fido2CredentialCreate
+                    &&
+                    _appOptions != null)
+                {
+                    _appOptions.HasUnlockedInThisTransaction = false;
+                }
+
                 if (intent?.GetStringExtra("uri") is string uri)
                 {
                     _messagingService.Send(App.App.POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE);