Merge pull request #2760 from brandonpage/fix-bio-auth

brandonpage · web-flow · commit c9f05869b876 · 2025-09-09T16:33:27.000-07:00
Biometric Authentication bugfixes
diff --git 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
@@ -163,7 +163,7 @@ fun LoginView() {
             LoginViewModel.BottomBarButton(
                 stringResource(viewModel.biometricAuthenticationButtonText.intValue)
             ) {
-                viewModel.biometricAuthenticationButtonAction
+                viewModel.biometricAuthenticationButtonAction.value?.invoke() ?: activity.onBioAuthClick()
             }
         } else null
     val idpButton =

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ internal abstract class AppLockManager(`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`fun onAppBackgrounded() {`
`59`		`- lastBackgroundTimestamp = System.currentTimeMillis()`
	`59`	`+ if (!locked) {`
	`60`	`+ lastBackgroundTimestamp = System.currentTimeMillis()`
	`61`	`+ }`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`fun onUnlock() {`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ fun LoginView() {`
`163`	`163`	`LoginViewModel.BottomBarButton(`
`164`	`164`	`stringResource(viewModel.biometricAuthenticationButtonText.intValue)`
`165`	`165`	`) {`
`166`		`- viewModel.biometricAuthenticationButtonAction`
	`166`	`+ viewModel.biometricAuthenticationButtonAction.value?.invoke() ?: activity.onBioAuthClick()`
`167`	`167`	`}`
`168`	`168`	`} else null`
`169`	`169`	`val idpButton =`