Bug 1880476 — Remove redundant caching and destroy jexl helper after use

fenix/125.0
James Hugman 4 months ago committed by mergify[bot]
parent c0111386f8
commit 039c1238a8

@ -23,6 +23,7 @@ import androidx.fragment.app.Fragment
import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import mozilla.components.service.nimbus.evalJexlSafe import mozilla.components.service.nimbus.evalJexlSafe
import mozilla.components.service.nimbus.messaging.use
import mozilla.components.support.base.ext.areNotificationsEnabledSafe import mozilla.components.support.base.ext.areNotificationsEnabledSafe
import mozilla.components.support.utils.BrowsersCache import mozilla.components.support.utils.BrowsersCache
import org.mozilla.fenix.R import org.mozilla.fenix.R
@ -228,7 +229,7 @@ class OnboardingFragment : Fragment() {
showAddWidgetPage: Boolean, showAddWidgetPage: Boolean,
): List<OnboardingPageUiData> { ): List<OnboardingPageUiData> {
val jexlConditions = FxNimbus.features.junoOnboarding.value().conditions val jexlConditions = FxNimbus.features.junoOnboarding.value().conditions
val jexlHelper = requireContext().components.analytics.messagingStorage.helper val jexlHelper = requireContext().components.analytics.messagingStorage.createMessagingHelper()
val privacyCaption = Caption( val privacyCaption = Caption(
text = getString(R.string.juno_onboarding_privacy_notice_text), text = getString(R.string.juno_onboarding_privacy_notice_text),
@ -249,12 +250,14 @@ class OnboardingFragment : Fragment() {
}, },
), ),
) )
return FxNimbus.features.junoOnboarding.value().cards.values.toPageUiData( return jexlHelper.use {
privacyCaption, FxNimbus.features.junoOnboarding.value().cards.values.toPageUiData(
showDefaultBrowserPage, privacyCaption,
showNotificationPage, showDefaultBrowserPage,
showAddWidgetPage, showNotificationPage,
jexlConditions, showAddWidgetPage,
) { condition -> jexlHelper.evalJexlSafe(condition) } jexlConditions,
) { condition -> jexlHelper.evalJexlSafe(condition) }
}
} }
} }

Loading…
Cancel
Save