Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-17 15:26:23 +00:00
Code Issues Releases Wiki Activity

[fenix] Minor cleanup of the account settings

Browse Source
This commit is contained in:
Grisha Kruglov 2021-05-27 22:43:28 -07:00 committed by Grisha Kruglov
parent 0bedcba4e5
commit 9647ae5fad
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
View File

@ -183,24 +183,22 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
).forEach {
requirePreference<CheckBoxPreference>(it.prefId()).apply {
setOnPreferenceChangeListener { _, newValue ->
updateSyncEngineState(context, it, newValue as Boolean)
updateSyncEngineState(it, newValue as Boolean)
true
}
}
}
// 'Passwords' and 'Credit card' listeners are special, since we also display a pin protection warning.
requirePreference<CheckBoxPreference>(SyncEngine.Passwords.prefId()).apply {
setOnPreferenceChangeListener { _, newValue ->
updateSyncEngineStateWithPinWarning(SyncEngine.Passwords, newValue as Boolean)
true
}
}
requirePreference<CheckBoxPreference>(SyncEngine.CreditCards.prefId()).apply {
setOnPreferenceChangeListener { _, newValue ->
updateSyncEngineStateWithPinWarning(SyncEngine.CreditCards, newValue as Boolean)
true
listOf(
SyncEngine.Passwords,
SyncEngine.CreditCards
).forEach {
requirePreference<CheckBoxPreference>(it.prefId()).apply {
setOnPreferenceChangeListener { _, newValue ->
updateSyncEngineStateWithPinWarning(it, newValue as Boolean)
true
}
}
}
@ -223,10 +221,10 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
*
* Currently used for logins and credit cards.
*
* @param engine the sync engine whose preference has changed.
* @param syncEngine the sync engine whose preference has changed.
* @param newValue the value denoting whether or not to sync the specified preference.
*/
private fun CheckBoxPreference.updateSyncEngineStateWithPinWarning(
private fun updateSyncEngineStateWithPinWarning(
syncEngine: SyncEngine,
newValue: Boolean
) {
@ -236,7 +234,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
!newValue ||
!requireContext().settings().shouldShowSecurityPinWarningSync
) {
updateSyncEngineState(context, syncEngine, newValue)
updateSyncEngineState(syncEngine, newValue)
} else {
showPinDialogWarning(syncEngine, newValue)
}
@ -250,10 +248,10 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
* @param newValue the new value of the sync preference, where true indicates sync for that
* preference and false indicates not synced.
*/
private fun updateSyncEngineState(context: Context, engine: SyncEngine, newValue: Boolean) {
SyncEnginesStorage(context).setStatus(engine, newValue)
private fun updateSyncEngineState(engine: SyncEngine, newValue: Boolean) {
SyncEnginesStorage(requireContext()).setStatus(engine, newValue)
viewLifecycleOwner.lifecycleScope.launch {
context.components.backgroundServices.accountManager.syncNow(SyncReason.EngineChange)
requireContext().components.backgroundServices.accountManager.syncNow(SyncReason.EngineChange)
}
}
@ -276,7 +274,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
)
setNegativeButton(getString(R.string.logins_warning_dialog_later)) { _: DialogInterface, _ ->
updateSyncEngineState(context, syncEngine, newValue)
updateSyncEngineState(syncEngine, newValue)
}
setPositiveButton(getString(R.string.logins_warning_dialog_set_up_now)) { it: DialogInterface, _ ->

8
app/src/main/res/xml/account_settings_preferences.xml
View File

@ -30,8 +30,7 @@
android:title="@string/preferences_sync_bookmarks" />
<CheckBoxPreference
android:defaultValue="false"
android:visible="false"
android:defaultValue="true"
android:key="@string/pref_key_sync_credit_cards"
android:layout="@layout/checkbox_left_preference"
android:title="@string/preferences_sync_credit_cards" />
@ -49,13 +48,14 @@
android:title="@string/preferences_sync_logins" />
<CheckBoxPreference
android:defaultValue="false"
android:defaultValue="true"
android:key="@string/pref_key_sync_tabs"
android:layout="@layout/checkbox_left_preference"
android:title="@string/preferences_sync_tabs_2"/>
<!-- The default visibility is 'false' because we don't display this on most channels. -->
<CheckBoxPreference
android:defaultValue="false"
android:defaultValue="true"
android:visible="false"
android:key="@string/pref_key_sync_address"
android:layout="@layout/checkbox_left_preference"