From 210864186b062fd688acfe843db9525386fb1554 Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Fri, 26 Jul 2019 00:25:12 -0700 Subject: [PATCH] Reflect current sync status when opening account settings --- .../org/mozilla/fenix/settings/AccountSettingsFragment.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt index c3dbe083d..b31de0e87 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt @@ -98,6 +98,14 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { preferenceSyncNow?.let { it.onPreferenceClickListener = getClickListenerForSyncNow() updateLastSyncedTimePref(context!!, it) + + // Current sync state + if (requireComponents.backgroundServices.accountManager.isSyncActive()) { + it.title = getString(R.string.sync_syncing_in_progress) + it.isEnabled = false + } else { + it.isEnabled = true + } } // Device Name