ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixup breaking changes from AppServices upgrade to 93.0.0

This commit is contained in:
James Hugman 2022-04-07 23:45:13 +01:00
parent 051e3bbd50
commit d2f6aa2211
No known key found for this signature in database
GPG Key ID: C8ECBFECD3428032
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorage.kt
View File

@ -41,7 +41,7 @@ class NimbusMessagingStorage(
val nimbusActions = nimbusFeature.actions val nimbusActions = nimbusFeature.actions
val nimbusMessages = nimbusFeature.messages val nimbusMessages = nimbusFeature.messages
val defaultStyle = StyleData(context) val defaultStyle = StyleData()
val storageMetadata = metadataStorage.getMetadata() val storageMetadata = metadataStorage.getMetadata()
return nimbusMessages.mapNotNull { (key, value) -> return nimbusMessages.mapNotNull { (key, value) ->

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

@ -445,7 +445,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
*/ */
var searchTermTabGroupsAreEnabled by lazyFeatureFlagPreference( var searchTermTabGroupsAreEnabled by lazyFeatureFlagPreference(
appContext.getPreferenceKey(R.string.pref_key_search_term_tab_groups), appContext.getPreferenceKey(R.string.pref_key_search_term_tab_groups),
default = { FxNimbus.features.searchTermGroups.value(appContext).enabled }, default = { FxNimbus.features.searchTermGroups.value().enabled },
featureFlag = FeatureFlags.tabGroupFeature featureFlag = FeatureFlags.tabGroupFeature
) )
@ -1209,7 +1209,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
) )
private val homescreenSections: Map<HomeScreenSection, Boolean> by lazy { private val homescreenSections: Map<HomeScreenSection, Boolean> by lazy {
FxNimbus.features.homescreen.value(appContext).sectionsEnabled FxNimbus.features.homescreen.value().sectionsEnabled
} }
var historyMetadataUIFeature by lazyFeatureFlagPreference( var historyMetadataUIFeature by lazyFeatureFlagPreference(

2
app/src/test/java/org/mozilla/fenix/gleanplumb/DefaultMessageControllerTest.kt
View File

@ -125,7 +125,7 @@ class DefaultMessageControllerTest {
verify { store.dispatch(MessageDisplayed(message)) } verify { store.dispatch(MessageDisplayed(message)) }
} }
private fun mockMessage(data: MessageData = MessageData(_context = testContext)) = Message( private fun mockMessage(data: MessageData = MessageData()) = Message(
id = "id", id = "id",
data = data, data = data,
style = mockk(relaxed = true), style = mockk(relaxed = true),