@@ -23,7 +23,7 @@ import app.passwordstore.data.repo.PasswordRepository
23
23
import app.passwordstore.ui.crypto.BasePGPActivity
24
24
import app.passwordstore.ui.crypto.PasswordDialog
25
25
import app.passwordstore.util.auth.BiometricAuthenticator
26
- import app.passwordstore.util.auth.BiometricAuthenticator.Result
26
+ import app.passwordstore.util.auth.BiometricAuthenticator.Result as BiometricResult
27
27
import app.passwordstore.util.autofill.AutofillPreferences
28
28
import app.passwordstore.util.autofill.AutofillResponseBuilder
29
29
import app.passwordstore.util.autofill.DirectoryStructure
@@ -87,7 +87,7 @@ class AutofillDecryptActivity : BasePGPActivity() {
87
87
decrypt(filePath, clientState, action, authResult)
88
88
}
89
89
} else {
90
- decrypt(filePath, clientState, action, Result .CanceledByUser )
90
+ decrypt(filePath, clientState, action, BiometricResult .CanceledByUser )
91
91
}
92
92
}
93
93
}
@@ -96,7 +96,7 @@ class AutofillDecryptActivity : BasePGPActivity() {
96
96
filePath : String ,
97
97
clientState : Bundle ,
98
98
action : AutofillAction ,
99
- authResult : Result ,
99
+ authResult : BiometricResult ,
100
100
) {
101
101
val gpgIdentifiers =
102
102
getPGPIdentifiers(
@@ -105,15 +105,14 @@ class AutofillDecryptActivity : BasePGPActivity() {
105
105
lifecycleScope.launch(dispatcherProvider.main()) {
106
106
when (authResult) {
107
107
// Internally handled by the prompt dialog
108
- is Result .Retry -> {}
108
+ is BiometricResult .Retry -> {}
109
109
// 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 ->
114
114
askPassphrase(filePath, gpgIdentifiers, clientState, action)
115
- //
116
- is Result .Success -> {
115
+ is BiometricResult .Success -> {
117
116
/* clear passphrase cache on first use after application startup or if screen was off;
118
117
also make sure to purge a stale cache after caching has been disabled via PGP settings */
119
118
clearCache = settings.getBoolean(PreferenceKeys .CLEAR_PASSPHRASE_CACHE , true )
0 commit comments