Unverified Commit 10fdf130 authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub
Browse files

For #25933 - Ensure sponsored tiles are enable if enrolled in active experiment (#25948) 



(cherry picked from commit 1207180aa8f2431f449b2af5c5b31e1247824523)

Co-authored-by: default avatarGabriel Luong <gabriel.luong@gmail.com>
parent 05001d1f

app/src/main/java/org/mozilla/fenix/FenixApplication.kt

+0 −2
Original line number Diff line number Diff line
@@ -417,8 +417,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider { 
                onNimbusStartupAndUpdate()

            }

        })



        onNimbusStartupAndUpdate()

    }



    private fun onNimbusStartupAndUpdate() {

app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt

+2 −5
Original line number Diff line number Diff line
@@ -26,15 +26,12 @@ fun featureFlagPreference(key: String, default: Boolean, featureFlag: Boolean) = 


private class LazyPreference(val key: String, val default: () -> Boolean) :

    ReadWriteProperty<PreferencesHolder, Boolean> {

    private val property: ReadWriteProperty<PreferencesHolder, Boolean> 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()

}



/**

app/src/main/java/org/mozilla/fenix/utils/Settings.kt

+1 −2
Original line number Diff line number Diff line
@@ -1203,9 +1203,8 @@ class Settings(private val appContext: Context) : PreferencesHolder { 
        default = false

    )



    private val homescreenSections: Map<HomeScreenSection, Boolean> by lazy {

    private val homescreenSections: Map<HomeScreenSection, Boolean> get() =

        FxNimbus.features.homescreen.value().sectionsEnabled

    }



    var historyMetadataUIFeature by lazyFeatureFlagPreference(

        appContext.getPreferenceKey(R.string.pref_key_history_metadata_feature),