From 0b37080e476243f08579d9b25b6af26da5ecb4da Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Tue, 17 Oct 2023 21:47:51 -0700 Subject: [PATCH] remove biometrics confirmation when toggling on/off the setting yeah i tried a face unlock can you tell? --- .../main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt | 2 ++ .../kanade/tachiyomi/ui/setting/SettingsSecurityController.kt | 1 + .../java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt | 2 ++ 3 files changed, 5 insertions(+) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt index cba1aa73bd..a073a63e91 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt @@ -202,6 +202,7 @@ fun SwitchPreferenceCompat.requireAuthentication( activity: FragmentActivity?, title: String, subtitle: String? = null, + confirmationRequired: Boolean = true, ) { onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> newValue as Boolean @@ -209,6 +210,7 @@ fun SwitchPreferenceCompat.requireAuthentication( activity.startAuthentication( title, subtitle, + confirmationRequired, callback = object : AuthenticatorUtil.AuthenticationCallback() { override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) { super.onAuthenticationSucceeded(result) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt index 4c09fa4a5f..7fca50b8af 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt @@ -22,6 +22,7 @@ class SettingsSecurityController : SettingsController() { requireAuthentication( activity as? FragmentActivity, context.getString(R.string.lock_with_biometrics), + confirmationRequired = false, ) } intListPreference(activity) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt index 7325fb8337..dc7663ac47 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt @@ -27,6 +27,7 @@ object AuthenticatorUtil { fun FragmentActivity.startAuthentication( title: String, subtitle: String? = null, + confirmationRequired: Boolean = true, callback: AuthenticationCallback, ) { isAuthenticating = true @@ -41,6 +42,7 @@ object AuthenticatorUtil { .setTitle(title) .setSubtitle(subtitle) .setAllowedAuthenticators(BiometricManager.Authenticators.DEVICE_CREDENTIAL or BiometricManager.Authenticators.BIOMETRIC_WEAK) + .setConfirmationRequired(confirmationRequired) .build() biometricPrompt.authenticate(promptInfo)