mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-17 20:40:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash when entering to "Protect access" screen.

Browse source
This commit is contained in:
Benoit Marty 2023-05-09 13:46:49 +02:00
parent 79b451546d
commit 8b7601029b
1 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
View file

@ -16,9 +16,7 @@
package im.vector.app.features.settings package im.vector.app.features.settings
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.SwitchPreference import androidx.preference.SwitchPreference
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
@ -80,13 +78,13 @@ class VectorSettingsPinFragment :
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
updateBiometricPrefState(isPinCodeChecked = usePinCodePref.isChecked) updateBiometricPrefState(isPinCodeChecked = usePinCodePref.isChecked)
viewLifecycleOwner.lifecycleScope.launch {
refreshPinCodeStatus()
}
} }
override fun bindPref() { override fun bindPref() {
refreshPinCodeStatus()
usePinCodePref.setOnPreferenceChangeListener { _, value -> usePinCodePref.setOnPreferenceChangeListener { _, value ->
val isChecked = (value as? Boolean).orFalse() val isChecked = (value as? Boolean).orFalse()
updateBiometricPrefState(isPinCodeChecked = isChecked) updateBiometricPrefState(isPinCodeChecked = isChecked)
@ -130,9 +128,7 @@ class VectorSettingsPinFragment :
.onFailure { Timber.e(it) } .onFailure { Timber.e(it) }
} }
private fun refreshPinCodeStatus() { private suspend fun refreshPinCodeStatus() {
viewLifecycleOwner.lifecycleScope.launch {
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
val hasPinCode = pinCodeStore.hasEncodedPin() val hasPinCode = pinCodeStore.hasEncodedPin()
usePinCodePref.isChecked = hasPinCode usePinCodePref.isChecked = hasPinCode
usePinCodePref.onPreferenceClickListener = Preference.OnPreferenceClickListener { usePinCodePref.onPreferenceClickListener = Preference.OnPreferenceClickListener {
@ -162,14 +158,12 @@ class VectorSettingsPinFragment :
true true
} }
} }
}
}
private fun showEnableBiometricErrorMessage() { private fun showEnableBiometricErrorMessage() {
context?.toast(R.string.settings_security_pin_code_use_biometrics_error) context?.toast(R.string.settings_security_pin_code_use_biometrics_error)
} }
private val pinActivityResultLauncher = registerStartForActivityResult { private val pinActivityResultLauncher = registerStartForActivityResult {
refreshPinCodeStatus() // Nothing to do, refreshPinCodeStatus() will be called by `onResume`
} }
} }