bitwarden · andrebispo5 · Nov 18, 2025 · Oct 30, 2025 · Nov 6, 2025 · Nov 6, 2025
@@ -711,6 +711,25 @@ class AuthDiskSourceTest {
         assertEquals(biometricsKey, actual)
     }
 
+    @Test
+    fun `getUserBiometricUnlockKeyFlow should react to changes in getUserBiometricUnlockKey`() =
+        runTest {
+            val mockUserId = "mockUserId"
+            val biometricsKey = "1234"
+            authDiskSource.getUserBiometicUnlockKeyFlow(userId = mockUserId).test {
+                // The initial values of the Flow and the property are in sync
+                assertNull(authDiskSource.getUserBiometricUnlockKey(userId = mockUserId))
+                assertNull(awaitItem())
+
+                // Updating the disk source updates shared preferences
+                authDiskSource.storeUserBiometricUnlockKey(
+                    userId = mockUserId,
+                    biometricsKey = biometricsKey,
+                )
+                assertEquals(biometricsKey, awaitItem())
+            }
+        }
+
     @Test
     fun `storeUserBiometricInitVector for non-null values should update SharedPreferences`() {
         val biometricsInitVectorBaseKey = "bwSecureStorage:biometricInitializationVector"

@@ -1,6 +1,7 @@
 package com.bitwarden.authenticator.data.auth.datasource.disk
 
 import com.bitwarden.network.provider.AppIdProvider
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Primary access point for disk information.
@@ -28,6 +29,11 @@ interface AuthDiskSource : AppIdProvider {
      */
     fun getUserBiometricUnlockKey(): String?
 
+    /**
+     * Tracks the biometrics key.
+     */
+    fun getUserBiometricUnlockKeyFlow(): Flow<String?>
+
     /**
      * Stores the biometrics key.
      */

@@ -1,7 +1,10 @@
 package com.bitwarden.authenticator.data.auth.datasource.disk
 
 import android.content.SharedPreferences
+import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
 import com.bitwarden.data.datasource.disk.BaseEncryptedDiskSource
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.onSubscription
 import java.util.UUID
 
 private const val AUTHENTICATOR_SYNC_SYMMETRIC_KEY = "authenticatorSyncSymmetricKey"
@@ -20,6 +23,8 @@ class AuthDiskSourceImpl(
     sharedPreferences = sharedPreferences,
 ),
     AuthDiskSource {
+    private val mutableUserBiometricUnlockKeyFlow =
+        bufferedMutableSharedFlow<String?>()
 
     override val uniqueAppId: String
         get() = getString(key = UNIQUE_APP_ID_KEY) ?: generateAndStoreUniqueAppId()
@@ -39,13 +44,17 @@ class AuthDiskSourceImpl(
     override fun getUserBiometricUnlockKey(): String? =
         getEncryptedString(key = BIOMETRICS_UNLOCK_KEY)
 
+    override fun getUserBiometricUnlockKeyFlow(): Flow<String?> = mutableUserBiometricUnlockKeyFlow
+        .onSubscription { emit(getUserBiometricUnlockKey()) }
+
     override fun storeUserBiometricUnlockKey(
         biometricsKey: String?,
     ) {
         putEncryptedString(
             key = BIOMETRICS_UNLOCK_KEY,
             value = biometricsKey,
         )
+        mutableUserBiometricUnlockKeyFlow.tryEmit(biometricsKey)
     }
 
     override var authenticatorBridgeSymmetricSyncKey: ByteArray?

@@ -57,6 +57,11 @@ interface SettingsRepository {
      */
     val isUnlockWithBiometricsEnabled: Boolean
 
+    /**
+     * Tracks whether or not biometric unlocking is enabled for the current user.
+     */
+    val isUnlockWithBiometricsEnabledFlow: Flow<Boolean>
+
     /**
      * Tracks changes to the expiration alert threshold.
      */

@@ -66,6 +66,12 @@ class SettingsRepositoryImpl(
     override val isUnlockWithBiometricsEnabled: Boolean
         get() = authDiskSource.getUserBiometricUnlockKey() != null
 
+    override val isUnlockWithBiometricsEnabledFlow: Flow<Boolean>
+        get() =
+                authDiskSource
+                    .getUserBiometricUnlockKeyFlow()
+                    .map { it != null }
+
     override val appThemeStateFlow: StateFlow<AppTheme>
         get() = settingsDiskSource
             .appThemeFlow

diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/auth/unlock/UnlockScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/auth/unlock/UnlockScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -53,6 +54,12 @@ fun UnlockScreen(
         }
     }
 
+    LaunchedEffect(biometricsManager.isBiometricsSupported) {
+        if (!biometricsManager.isBiometricsSupported) {
+            onUnlocked()
+        }
+    }
+
     when (val dialog = state.dialog) {
         is UnlockState.Dialog.Error -> BitwardenBasicDialog(
             title = stringResource(id = BitwardenString.an_error_has_occurred),

@@ -7,6 +7,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDestination
 import androidx.navigation.NavHostController
@@ -19,13 +20,16 @@ import com.bitwarden.authenticator.ui.auth.unlock.unlockDestination
 import com.bitwarden.authenticator.ui.authenticator.feature.authenticator.AuthenticatorGraphRoute
 import com.bitwarden.authenticator.ui.authenticator.feature.authenticator.authenticatorGraph
 import com.bitwarden.authenticator.ui.authenticator.feature.authenticator.navigateToAuthenticatorGraph
+import com.bitwarden.authenticator.ui.platform.composition.LocalBiometricsManager
 import com.bitwarden.authenticator.ui.platform.feature.debugmenu.setupDebugMenuDestination
 import com.bitwarden.authenticator.ui.platform.feature.splash.SplashRoute
 import com.bitwarden.authenticator.ui.platform.feature.splash.navigateToSplash
 import com.bitwarden.authenticator.ui.platform.feature.splash.splashDestination
 import com.bitwarden.authenticator.ui.platform.feature.tutorial.TutorialRoute
 import com.bitwarden.authenticator.ui.platform.feature.tutorial.navigateToTutorial
 import com.bitwarden.authenticator.ui.platform.feature.tutorial.tutorialDestination
+import com.bitwarden.authenticator.ui.platform.manager.biometrics.BiometricsManager
+import com.bitwarden.ui.platform.base.util.LifecycleEventEffect
 import com.bitwarden.ui.platform.theme.NonNullEnterTransitionProvider
 import com.bitwarden.ui.platform.theme.NonNullExitTransitionProvider
 import com.bitwarden.ui.platform.theme.RootTransitionProviders
@@ -42,6 +46,7 @@ import java.util.concurrent.atomic.AtomicReference
 fun RootNavScreen(
     viewModel: RootNavViewModel = hiltViewModel(),
     navController: NavHostController = rememberNavController(),
+    biometricsManager: BiometricsManager = LocalBiometricsManager.current,
     onSplashScreenRemoved: () -> Unit = {},
     onExitApplication: () -> Unit,
 ) {
@@ -63,6 +68,13 @@ fun RootNavScreen(
             .launchIn(this)
     }
 
+    BiometricChanges(
+        biometricsManager = biometricsManager,
+        onBiometricSupportChange = {
+            viewModel.trySendAction(RootNavAction.Internal.BiometricSupportChanged(it))
+        },
+    )
+
     NavHost(
         navController = navController,
         startDestination = SplashRoute,
@@ -187,3 +199,18 @@ private fun AnimatedContentTransitionScope<NavBackStackEntry>.toExitTransition()
             else -> RootTransitionProviders.Exit.fadeOut
         }
     }
+
+@Composable
+private fun BiometricChanges(
+    biometricsManager: BiometricsManager,
+    onBiometricSupportChange: (isSupported: Boolean) -> Unit,
+) {
+    LifecycleEventEffect { _, event ->
+        when (event) {
+            Lifecycle.Event.ON_RESUME -> {
+                onBiometricSupportChange(biometricsManager.isBiometricsSupported)
+            }
+            else -> Unit
+        }
+    }
+}
@@ -60,6 +60,10 @@ class RootNavViewModel @Inject constructor(
             RootNavAction.Internal.AppUnlocked -> {
                 handleAppUnlocked()
             }
+
+            is RootNavAction.Internal.BiometricSupportChanged -> {
+                handleBiometricSupportChanged(action.isBiometricsSupported)
+            }
         }
     }
 
@@ -99,6 +103,12 @@ class RootNavViewModel @Inject constructor(
             it.copy(navState = RootNavState.NavState.Unlocked)
         }
     }
+
+    private fun handleBiometricSupportChanged(isBiometricsSupported: Boolean) {
+        if (!isBiometricsSupported) {
+            settingsRepository.clearBiometricsKey()
+        }
+    }
 }
 
 /**
@@ -173,6 +183,11 @@ sealed class RootNavAction {
          */
         data object AppUnlocked : Internal()
 
+        /**
+         * Indicates an update on device biometrics support.
+         */
+        data class BiometricSupportChanged(val isBiometricsSupported: Boolean) : Internal()
+
         /**
          * Indicates an update in the welcome guide being seen has been received.
          */

@@ -41,12 +41,14 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.bitwarden.authenticator.ui.platform.composition.LocalBiometricsManager
 import com.bitwarden.authenticator.ui.platform.feature.settings.data.model.DefaultSaveOption
 import com.bitwarden.authenticator.ui.platform.manager.biometrics.BiometricsManager
 import com.bitwarden.authenticator.ui.platform.util.displayLabel
 import com.bitwarden.ui.platform.base.util.EventsEffect
+import com.bitwarden.ui.platform.base.util.LifecycleEventEffect
 import com.bitwarden.ui.platform.base.util.annotatedStringResource
 import com.bitwarden.ui.platform.base.util.cardStyle
 import com.bitwarden.ui.platform.base.util.mirrorIfRtl
@@ -88,6 +90,14 @@ fun SettingsScreen(
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+    var hasBiometrics by remember { mutableStateOf(biometricsManager.isBiometricsSupported) }
+
+    // Recheck biometrics support when app comes to foreground
+    LifecycleEventEffect { _, event ->
+        if (event == Lifecycle.Event.ON_RESUME) {
+            hasBiometrics = biometricsManager.isBiometricsSupported
+        }
+    }
 
     EventsEffect(viewModel = viewModel) { event ->
         when (event) {
@@ -151,6 +161,7 @@ fun SettingsScreen(
             SecuritySettings(
                 state = state,
                 biometricsManager = biometricsManager,
+                hasBiometrics = hasBiometrics,
                 onBiometricToggle = remember(viewModel) {
                     {
                         viewModel.trySendAction(
@@ -270,6 +281,7 @@ fun SettingsScreen(
 private fun SecuritySettings(
     state: SettingsState,
     biometricsManager: BiometricsManager = LocalBiometricsManager.current,
+    hasBiometrics: Boolean,
     onBiometricToggle: (Boolean) -> Unit,
     onScreenCaptureChange: (Boolean) -> Unit,
 ) {
@@ -282,7 +294,6 @@ private fun SecuritySettings(
     )
 
     Spacer(modifier = Modifier.height(8.dp))
-    val hasBiometrics = biometricsManager.isBiometricsSupported
     if (hasBiometrics) {
         UnlockWithBiometricsRow(
             modifier = Modifier

@@ -81,6 +81,11 @@ class SettingsViewModel @Inject constructor(
             .map { SettingsAction.Internal.DefaultSaveOptionUpdated(it) }
             .onEach(::sendAction)
             .launchIn(viewModelScope)
+        settingsRepository
+            .isUnlockWithBiometricsEnabledFlow
+            .map { SettingsAction.Internal.UnlockWithBiometricsUpdated(it) }
+            .onEach(::sendAction)
+            .launchIn(viewModelScope)
     }
 
     override fun handleAction(action: SettingsAction) {
@@ -118,6 +123,20 @@ class SettingsViewModel @Inject constructor(
             }
 
             is SettingsAction.Internal.DynamicColorsUpdated -> handleDynamicColorsUpdated(action)
+
+            is SettingsAction.Internal.UnlockWithBiometricsUpdated -> {
+                handleUnlockWithBiometricsUpdated(action)
+            }
+        }
+    }
+
+    private fun handleUnlockWithBiometricsUpdated(
+        action: SettingsAction.Internal.UnlockWithBiometricsUpdated,
+    ) {
+        mutableStateFlow.update {
+            it.copy(
+                isUnlockWithBiometricsEnabled = action.isEnabled,
+            )
         }
     }
 
@@ -648,5 +667,12 @@ sealed class SettingsAction(
         data class DynamicColorsUpdated(
             val isEnabled: Boolean,
         ) : SettingsAction()
+
+        /**
+         * Indicates that the biometric state on disk was updated.
+         */
+        data class UnlockWithBiometricsUpdated(
+            val isEnabled: Boolean,
+        ) : SettingsAction()
     }
 }
@@ -1,12 +1,16 @@
 package com.bitwarden.authenticator.data.auth.datasource.disk.util
 
 import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSource
+import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.onSubscription
 import java.util.UUID
 
 class FakeAuthDiskSource : AuthDiskSource {
 
     private var lastActiveTimeMillis: Long? = null
     private var userBiometricUnlockKey: String? = null
+    private val userBiometricUnlockKeyFlow = bufferedMutableSharedFlow<String?>()
 
     override val uniqueAppId: String
         get() = UUID.randomUUID().toString()
@@ -19,7 +23,14 @@ class FakeAuthDiskSource : AuthDiskSource {
 
     override fun getUserBiometricUnlockKey(): String? = userBiometricUnlockKey
 
+    override fun getUserBiometricUnlockKeyFlow(): Flow<String?> =
+        userBiometricUnlockKeyFlow
+            .onSubscription {
+                emit(getUserBiometricUnlockKey())
+            }
+
     override fun storeUserBiometricUnlockKey(biometricsKey: String?) {
+        userBiometricUnlockKeyFlow.tryEmit(biometricsKey)
         this@FakeAuthDiskSource.userBiometricUnlockKey = biometricsKey
     }
 

@@ -165,4 +165,19 @@ class SettingsRepositoryTest {
         settingsRepository.previouslySyncedBitwardenAccountIds = setOf("1", "2", "3")
         verify { settingsDiskSource.previouslySyncedBitwardenAccountIds = setOf("1", "2", "3") }
     }
+
+    @Test
+    fun `isUnlockWithBiometricsEnabledFlow should react to changes in AuthDiskSource`() = runTest {
+        settingsRepository.isUnlockWithBiometricsEnabledFlow.test {
+            assertFalse(awaitItem())
+            authDiskSource.storeUserBiometricUnlockKey(
+                biometricsKey = "biometricsKey",
+            )
+            assertTrue(awaitItem())
+            authDiskSource.storeUserBiometricUnlockKey(
+                biometricsKey = null,
+            )
+            assertFalse(awaitItem())
+        }
+    }
 }