From 3b8eac0b8db8421b28bfb020acbc61fc76ecc2c6 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 2 Aug 2021 10:11:54 -0300 Subject: [PATCH] Disable registration lock toggle and pin reminder toggle if user does not have a pin. --- .../settings/app/account/AccountSettingsFragment.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt index 55744b6b7f..85d0753e66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt @@ -43,6 +43,11 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag } } + override fun onResume() { + super.onResume() + viewModel.refreshState() + } + override fun bindAdapter(adapter: DSLSettingsAdapter) { viewModel = ViewModelProviders.of(this)[AccountSettingsViewModel::class.java] @@ -70,7 +75,8 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag switchPref( title = DSLSettingsText.from(R.string.preferences_app_protection__pin_reminders), summary = DSLSettingsText.from(R.string.AccountSettingsFragment__youll_be_asked_less_frequently), - isChecked = state.pinRemindersEnabled, + isChecked = state.hasPin && state.pinRemindersEnabled, + isEnabled = state.hasPin, onClick = { setPinRemindersEnabled(!state.pinRemindersEnabled) } @@ -80,6 +86,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag title = DSLSettingsText.from(R.string.preferences_app_protection__registration_lock), summary = DSLSettingsText.from(R.string.AccountSettingsFragment__require_your_signal_pin), isChecked = state.registrationLockEnabled, + isEnabled = state.hasPin, onClick = { setRegistrationLockEnabled(!state.registrationLockEnabled) }