summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2023-12-10 22:55:25 +0530
committerGitHub <noreply@github.com>2023-12-10 22:55:25 +0530
commita04d6fa9f4b7163d18c7a2298c79ae8600c2c5e6 (patch)
tree6603759ef1cb11402551d4a285a43b65f8d0a774 /app/src/main
parentd00626d5d36298b6f94f8186f2cb2c2b33cdae5e (diff)
fix: temporarily disable pre-launch biometric auth (#2803)
* fix: temporarily disable pre-launch biometric auth Completely broken right now and prevents users from opening the app. Updates #2802 * fix: disable UnusedResources lint
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt4
-rw-r--r--app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt17
-rw-r--r--app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt1
3 files changed, 12 insertions, 10 deletions
diff --git a/app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt b/app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt
index d61515fd..1f08f529 100644
--- a/app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt
@@ -25,14 +25,14 @@ class LaunchActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val prefs = sharedPrefs
- if (prefs.getBoolean(PreferenceKeys.BIOMETRIC_AUTH, false)) {
+ if (prefs.getBoolean(PreferenceKeys.BIOMETRIC_AUTH_2, false)) {
BiometricAuthenticator.authenticate(this) { result ->
when (result) {
is Result.Success -> {
startTargetActivity(false)
}
is Result.HardwareUnavailableOrDisabled -> {
- prefs.edit { remove(PreferenceKeys.BIOMETRIC_AUTH) }
+ prefs.edit { remove(PreferenceKeys.BIOMETRIC_AUTH_2) }
startTargetActivity(false)
}
is Result.Failure,
diff --git a/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt b/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
index 7d2ecbf2..6044b5a8 100644
--- a/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
+++ b/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
@@ -65,14 +65,15 @@ class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider
defaultValue = false
}
- val canAuthenticate = BiometricAuthenticator.canAuthenticate(activity)
- switch(PreferenceKeys.BIOMETRIC_AUTH) {
+ // val canAuthenticate = BiometricAuthenticator.canAuthenticate(activity)
+ switch(PreferenceKeys.BIOMETRIC_AUTH_2) {
titleRes = R.string.pref_biometric_auth_title
defaultValue = false
- enabled = canAuthenticate
- summaryRes =
- if (canAuthenticate) R.string.pref_biometric_auth_summary
- else R.string.pref_biometric_auth_summary_error
+ enabled = false
+ // summaryRes =
+ // if (canAuthenticate) R.string.pref_biometric_auth_summary
+ // else R.string.pref_biometric_auth_summary_error
+ summary = "Temporarily disabled due to a bug, see issue 2802"
onClick {
enabled = false
val isChecked = checked
@@ -81,7 +82,7 @@ class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider
when (result) {
is Result.Success -> {
// Apply the changes
- putBoolean(PreferenceKeys.BIOMETRIC_AUTH, checked)
+ putBoolean(PreferenceKeys.BIOMETRIC_AUTH_2, checked)
enabled = true
}
is Result.Retry -> {}
@@ -89,7 +90,7 @@ class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider
// If any error occurs, revert back to the previous
// state. This
// catch-all clause includes the cancellation case.
- putBoolean(PreferenceKeys.BIOMETRIC_AUTH, !checked)
+ putBoolean(PreferenceKeys.BIOMETRIC_AUTH_2, !checked)
checked = !isChecked
enabled = true
}
diff --git a/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt b/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt
index 12ea0d76..5e55582c 100644
--- a/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt
+++ b/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt
@@ -10,6 +10,7 @@ object PreferenceKeys {
const val APP_THEME = "app_theme"
const val AUTOFILL_ENABLE = "autofill_enable"
const val BIOMETRIC_AUTH = "biometric_auth"
+ const val BIOMETRIC_AUTH_2 = "biometric_auth_delete_soon_please"
@Deprecated(
message = "Use CLEAR_CLIPBOARD_HISTORY instead",
replaceWith = ReplaceWith("PreferenceKeys.CLEAR_CLIPBOARD_HISTORY"),