Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 8095ee4

Browse files
committed
refactor: import-alias BiometricAuthenticator.Result
1 parent a064116 commit 8095ee4

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import app.passwordstore.data.repo.PasswordRepository
2323
import app.passwordstore.ui.crypto.BasePGPActivity
2424
import app.passwordstore.ui.crypto.PasswordDialog
2525
import app.passwordstore.util.auth.BiometricAuthenticator
26-
import app.passwordstore.util.auth.BiometricAuthenticator.Result
26+
import app.passwordstore.util.auth.BiometricAuthenticator.Result as BiometricResult
2727
import app.passwordstore.util.autofill.AutofillPreferences
2828
import app.passwordstore.util.autofill.AutofillResponseBuilder
2929
import app.passwordstore.util.autofill.DirectoryStructure
@@ -87,7 +87,7 @@ class AutofillDecryptActivity : BasePGPActivity() {
8787
decrypt(filePath, clientState, action, authResult)
8888
}
8989
} else {
90-
decrypt(filePath, clientState, action, Result.CanceledByUser)
90+
decrypt(filePath, clientState, action, BiometricResult.CanceledByUser)
9191
}
9292
}
9393
}
@@ -96,7 +96,7 @@ class AutofillDecryptActivity : BasePGPActivity() {
9696
filePath: String,
9797
clientState: Bundle,
9898
action: AutofillAction,
99-
authResult: Result,
99+
authResult: BiometricResult,
100100
) {
101101
val gpgIdentifiers =
102102
getPGPIdentifiers(
@@ -105,15 +105,14 @@ class AutofillDecryptActivity : BasePGPActivity() {
105105
lifecycleScope.launch(dispatcherProvider.main()) {
106106
when (authResult) {
107107
// Internally handled by the prompt dialog
108-
is Result.Retry -> {}
108+
is BiometricResult.Retry -> {}
109109
// If the dialog is dismissed for any reason, prompt for passphrase
110-
is Result.CanceledBySystem,
111-
is Result.CanceledByUser,
112-
is Result.Failure,
113-
is Result.HardwareUnavailableOrDisabled ->
110+
is BiometricResult.CanceledBySystem,
111+
is BiometricResult.CanceledByUser,
112+
is BiometricResult.Failure,
113+
is BiometricResult.HardwareUnavailableOrDisabled ->
114114
askPassphrase(filePath, gpgIdentifiers, clientState, action)
115-
//
116-
is Result.Success -> {
115+
is BiometricResult.Success -> {
117116
/* clear passphrase cache on first use after application startup or if screen was off;
118117
also make sure to purge a stale cache after caching has been disabled via PGP settings */
119118
clearCache = settings.getBoolean(PreferenceKeys.CLEAR_PASSPHRASE_CACHE, true)

app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ class DecryptActivity : BasePGPActivity() {
168168
is BiometricResult.Failure,
169169
is BiometricResult.HardwareUnavailableOrDisabled ->
170170
askPassphrase(isError, gpgIdentifiers, authResult)
171-
//
172171
is BiometricResult.Success -> {
173172
/* clear passphrase cache on first use after application startup or if screen was off;
174173
also make sure to purge a stale cache after caching has been disabled via PGP settings */

0 commit comments

Comments
 (0)