From 205af4153de91c15fb7f234ead5867dcf3a81254 Mon Sep 17 00:00:00 2001 From: ekager Date: Wed, 6 Mar 2019 20:27:47 -0800 Subject: [PATCH] Closes #867 - Update Default Browser Toggle in onResume --- .../org/mozilla/fenix/settings/DefaultBrowserPreference.kt | 2 +- .../main/java/org/mozilla/fenix/settings/SettingsFragment.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt index 0bb9fdc4d..58d851d87 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt @@ -35,7 +35,7 @@ class DefaultBrowserPreference : Preference { updateSwitch() } - private fun updateSwitch() { + fun updateSwitch() { val browsers = Browsers.all(context) switchView?.isChecked = browsers.isDefaultBrowser } diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt index 63ede1c8a..62c1386d7 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt @@ -69,6 +69,10 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse super.onResume() (activity as AppCompatActivity).supportActionBar?.show() + val preference = + findPreference(getString(R.string.pref_key_make_default_browser)) as DefaultBrowserPreference + + preference.updateSwitch() generateWordmark() setupPreferences() setupAccountUI()