github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-31 09:46:08 -05:00
Code Issues 1.8k Packages Projects Releases 126 Wiki Activity

BIT-2156: auto-prompt the user for biometrics (#1307)

Browse Source
This commit is contained in:
David Perez
2024-04-25 16:21:07 -05:00
committed by Álison Fernandes
parent bb1fd4ae4f
commit bde338ef44
4 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt
View File

@@ -27,7 +27,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.testTag
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -72,11 +71,26 @@ fun VaultUnlockScreen(
val state by viewModel.stateFlow.collectAsStateWithLifecycle()
val context = LocalContext.current
val resources = context.resources
val onBiometricsUnlockClick: () -> Unit = remember(viewModel) {
{ viewModel.trySendAction(VaultUnlockAction.BiometricsUnlockClick) }
}
val onBiometricsLockOut: () -> Unit = remember(viewModel) {
{ viewModel.trySendAction(VaultUnlockAction.BiometricsLockOut) }
}
EventsEffect(viewModel = viewModel) { event ->
when (event) {
is VaultUnlockEvent.ShowToast -> {
Toast.makeText(context, event.text(resources), Toast.LENGTH_SHORT).show()
}
VaultUnlockEvent.PromptForBiometrics -> {
biometricsManager.promptForBiometrics(
onSuccess = onBiometricsUnlockClick,
onLockOut = onBiometricsLockOut,
)
}
}
}
@@ -121,12 +135,6 @@ fun VaultUnlockScreen(
)
}
val onBiometricsUnlockClick: () -> Unit = remember(viewModel) {
{ viewModel.trySendAction(VaultUnlockAction.BiometricsUnlockClick) }
}
val onBiometricsLockOut: () -> Unit = remember(viewModel) {
{ viewModel.trySendAction(VaultUnlockAction.BiometricsLockOut) }
}
// Content
BitwardenScaffold(
modifier = Modifier
@@ -209,14 +217,8 @@ fun VaultUnlockScreen(
BitwardenOutlinedButton(
label = stringResource(id = R.string.use_biometrics_to_unlock),
onClick = {
biometricsManager.promptBiometrics(
biometricsManager.promptForBiometrics(
onSuccess = onBiometricsUnlockClick,
onCancel = {
// no-op
},
onError = {
// no-op
},
onLockOut = onBiometricsLockOut,
)
},
@@ -266,3 +268,22 @@ fun VaultUnlockScreen(
}
}
}
/**
* Helper method for easier prompting for biometrics.
*/
private fun BiometricsManager.promptForBiometrics(
onSuccess: () -> Unit,
onLockOut: () -> Unit,
) {
promptBiometrics(
onSuccess = onSuccess,
onCancel = {
// no-op
},
onError = {
// no-op
},
onLockOut = onLockOut,
)
}

9
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt
View File

@@ -94,6 +94,10 @@ class VaultUnlockViewModel @Inject constructor(
sendAction(VaultUnlockAction.Internal.UserStateUpdateReceive(userState = it))
}
.launchIn(viewModelScope)
if (state.showBiometricLogin) {
sendEvent(VaultUnlockEvent.PromptForBiometrics)
}
}
override fun handleAction(action: VaultUnlockAction) {
@@ -336,6 +340,11 @@ sealed class VaultUnlockEvent {
data class ShowToast(
val text: Text,
) : VaultUnlockEvent()
/**
* Prompts the user for biometrics unlock.
*/
data object PromptForBiometrics : VaultUnlockEvent()
}
/**