Skip to content

fix: autofill biometric abort #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OffRange merged 2 commits into from
Aug 26, 2026
Merged

fix: autofill biometric abort #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6b9e62
fix(autofill): abort autofill when biometric is canceled
OffRange Aug 26, 2026
f429f78
doc(autofill): add decline doc
OffRange Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../security/src/main/kotlin/de/davis/keygo/core/security/domain/model/BiometricAuthError.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package de.davis.keygo.core.security.domain.model


sealed interface BiometricAuthError {
/** User canceled the prompt by pressing the negative button. */
data object Declined : BiometricAuthError
data object LockedOut : BiometricAuthError
data object Canceled : BiometricAuthError
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/kotlin/de/davis/keygo/feature/autofill/presentation/activity/AutofillActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ internal class AutofillActivity : FragmentActivity() {
}.onSuccess {
viewModel.onBiometricLoginSucceeded()
}.onFailure {
viewModel.onBiometricLoginFailed()
viewModel.onBiometricLoginFailed(it)
}
}

Expand Down
15 changes: 13 additions & 2 deletions ...rc/main/kotlin/de/davis/keygo/feature/autofill/presentation/activity/AutofillViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.core.util.PatternsCompat
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import de.davis.keygo.core.identity.domain.model.UnlockError
import de.davis.keygo.core.item.domain.alias.ItemId
import de.davis.keygo.core.item.domain.model.Login
import de.davis.keygo.core.item.domain.repository.ItemRepository
Expand All @@ -15,6 +16,7 @@ import de.davis.keygo.core.security.domain.crypto.CryptographicScopeProvider
import de.davis.keygo.core.security.domain.crypto.decrypt
import de.davis.keygo.core.security.domain.crypto.model.WrappedVaultKeyInformation
import de.davis.keygo.core.security.domain.crypto.wrappedItemKeyInformation
import de.davis.keygo.core.security.domain.model.BiometricAuthError
import de.davis.keygo.core.util.getOrNull
import de.davis.keygo.feature.autofill.domain.usecase.AddRegistrableDomainsToLoginUseCase
import de.davis.keygo.feature.autofill.domain.usecase.DoesItemHaveDomainReferencesUseCase
Expand Down Expand Up @@ -148,9 +150,18 @@ internal class AutofillViewModel(
biometricChannel.send(AutofillBiometricRequest.UnlockItem(itemName))
}

fun onBiometricLoginFailed() {
fun onBiometricLoginFailed(error: UnlockError) {
viewModelScope.launch {
_uiState.update { it.copy(request = Request.JustAuthenticateWithPwd) }
when(error) {
is UnlockError.BiometricFailed -> {
when(error.error) {
BiometricAuthError.Canceled -> eventChannel.send(AutofillEvent.Abort)
else -> _uiState.update { it.copy(request = Request.JustAuthenticateWithPwd) }
}
}

else -> _uiState.update { it.copy(request = Request.JustAuthenticateWithPwd) }
}
}
}

Expand Down
Loading