From 93191e67c44cee1d235a3646520009636d140976 Mon Sep 17 00:00:00 2001 From: Corewala Date: Tue, 17 May 2022 13:19:04 -0400 Subject: [PATCH] Touched up client cert settings --- .../main/java/corewala/buran/ui/settings/SettingsFragment.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 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 aecfd41..4cfad26 100644 --- a/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt @@ -280,6 +280,7 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang null ) + clientCertPassword.dialogTitle = getString(R.string.client_certificate_password) if (certPassword != null && certPassword.isNotEmpty()) { clientCertPassword.summary = getDots(certPassword) } else { @@ -307,7 +308,7 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang certificateCategory.addPreference(passwordInitVector) if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P){ - useBiometrics.isVisible = certPassword?.isNotEmpty() ?: false + useBiometrics.isVisible = (certPassword?.isNotEmpty() ?: false) or useBiometrics.isChecked useBiometrics.setOnPreferenceChangeListener { _, newValue -> val biometricManager = BuranBiometricManager() @@ -333,7 +334,7 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang val initializationVector = encryptedData.initializationVector passwordInitVector.text = initializationVector.contentToString() passwordCiphertext.text = ciphertext.contentToString() - clientCertPassword.text = "encrypted" + clientCertPassword.text = null }else{ val ciphertext = biometricManager.decodeByteArray(passwordCiphertext.text) clientCertPassword.text = biometricManager.decryptData(ciphertext, result.cryptoObject?.cipher!!)