From 10fdf130c4c83ae91447b3e88b14dd24d56f363c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 10:35:34 -0400 Subject: [PATCH] For #25933 - Ensure sponsored tiles are enable if enrolled in active experiment (#25948) (cherry picked from commit 1207180aa8f2431f449b2af5c5b31e1247824523) Co-authored-by: Gabriel Luong --- app/src/main/java/org/mozilla/fenix/FenixApplication.kt | 2 -- .../fenix/components/settings/FeatureFlagPreference.kt | 7 ++----- app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt index ee54213beb..bce9c4d20e 100644 --- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt +++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt @@ -417,8 +417,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider { onNimbusStartupAndUpdate() } }) - - onNimbusStartupAndUpdate() } private fun onNimbusStartupAndUpdate() { diff --git a/app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt b/app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt index e363b67b64..a3179d29cc 100644 --- a/app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt +++ b/app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt @@ -26,15 +26,12 @@ fun featureFlagPreference(key: String, default: Boolean, featureFlag: Boolean) = private class LazyPreference(val key: String, val default: () -> Boolean) : ReadWriteProperty { - private val property: ReadWriteProperty by lazy { - booleanPreference(key, default()) - } override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>) = - this.property.getValue(thisRef, property) + thisRef.preferences.getBoolean(key, default()) override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: Boolean) = - this.property.setValue(thisRef, property, value) + thisRef.preferences.edit().putBoolean(key, value).apply() } /** diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 2b535219eb..d832689ce6 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -1203,9 +1203,8 @@ class Settings(private val appContext: Context) : PreferencesHolder { default = false ) - private val homescreenSections: Map by lazy { + private val homescreenSections: Map get() = FxNimbus.features.homescreen.value().sectionsEnabled - } var historyMetadataUIFeature by lazyFeatureFlagPreference( appContext.getPreferenceKey(R.string.pref_key_history_metadata_feature),