From 20d4c720de6b2bf14c688380692f3a3e599321aa Mon Sep 17 00:00:00 2001
From: Brandon Page <cof6676@gmail.com>
Date: Tue, 9 Sep 2025 14:25:43 -0700
Subject: [PATCH] Fix button action and bio auth bypass on RN.

---
 .../src/com/salesforce/androidsdk/security/AppLockManager.kt  | 4 +++-
 .../src/com/salesforce/androidsdk/ui/components/LoginView.kt  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/security/AppLockManager.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/security/AppLockManager.kt
index d56d7a9cce..2b99046edb 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/security/AppLockManager.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/security/AppLockManager.kt
@@ -56,7 +56,9 @@ internal abstract class AppLockManager(
     }
 
     fun onAppBackgrounded() {
-        lastBackgroundTimestamp = System.currentTimeMillis()
+        if (!locked) {
+            lastBackgroundTimestamp = System.currentTimeMillis()
+        }
     }
 
     fun onUnlock() {
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/LoginView.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/LoginView.kt
index 4675a22b7a..b797bffc91 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/LoginView.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/LoginView.kt
@@ -163,7 +163,7 @@ fun LoginView() {
             LoginViewModel.BottomBarButton(
                 stringResource(viewModel.biometricAuthenticationButtonText.intValue)
             ) {
-                viewModel.biometricAuthenticationButtonAction
+                viewModel.biometricAuthenticationButtonAction.value?.invoke() ?: activity.onBioAuthClick()
             }
         } else null
     val idpButton =