From bedbc9fb987faabc5dd19f4827a2e24a09b6023e Mon Sep 17 00:00:00 2001 From: Corewala Date: Mon, 20 Feb 2023 16:14:17 -0500 Subject: [PATCH] Made preferences less vulnerable to accidentally changing certificates --- .../java/corewala/buran/ui/settings/SettingsFragment.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt b/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt index e77e5c4..463f6b8 100644 --- a/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt @@ -365,7 +365,7 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply { addCategory(Intent.CATEGORY_OPENABLE) addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) - type = "*/*" + type = "application/x-pkcs12" } startActivityForResult(intent, PREFS_SET_CLIENT_CERT_REQ) true @@ -373,7 +373,6 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang certificateCategory.addPreference(clientCertPref) - val clientCertPassword = EditTextPreference(context) clientCertPassword.key = Buran.PREF_KEY_CLIENT_CERT_PASSWORD clientCertPassword.title = getString(R.string.client_certificate_password) @@ -399,7 +398,6 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang useBiometrics.isVisible = false certificateCategory.addPreference(useBiometrics) - val passwordCiphertext = EditTextPreference(context) passwordCiphertext.key = "password_ciphertext" passwordCiphertext.isVisible = false @@ -445,6 +443,7 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang clientCertPassword.summary = getDots(clientCertPassword.text) } clientCertPassword.isVisible = !(newValue as Boolean) + clientCertPref.isEnabled = !(newValue as Boolean) } } @@ -497,7 +496,6 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang persistPermissions(uri) findFilename(uri) } - } super.onActivityResult(requestCode, resultCode, data) }