Commit 8610d720 authored by Matthew Finkel's avatar Matthew Finkel Committed by Pier Angelo Vendrame
Browse files

Bug 40185: [android] Use NimbusDisabled

parent 67ad1b1a

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

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider { 
        )



        // Set the metric configuration from Nimbus.

        Glean.applyServerKnobsConfig(FxNimbus.features.glean.value().metricsEnabled)

        // Glean.applyServerKnobsConfig(FxNimbus.features.glean.value().metricsEnabled)



        Glean.initialize(

            applicationContext = this,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt

+7 −5
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { 
            }

        } else {

            lifecycleScope.launch(IO) {

                showFullscreenMessageIfNeeded(applicationContext)

                // showFullscreenMessageIfNeeded(applicationContext)

            }



            // Unless the activity is recreated, navigate to home first (without rendering it)
@@ -1270,10 +1270,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { 
            keyDismissButtonText = null,

        )



        /*

        researchSurfaceDialogFragment.onAccept = {

            processIntent(messaging.getIntentForMessage(nextMessage))

            components.appStore.dispatch(AppAction.MessagingAction.MessageClicked(nextMessage))

        }

        */



        researchSurfaceDialogFragment.onDismiss = {

            components.appStore.dispatch(AppAction.MessagingAction.MessageDismissed(nextMessage))
@@ -1286,10 +1288,10 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { 
            )

        }



        // Update message as displayed.

        val currentBootUniqueIdentifier = BootUtils.getBootIdentifier(context)



        messaging.onMessageDisplayed(nextMessage, currentBootUniqueIdentifier)

//        // Update message as displayed.

//        val currentBootUniqueIdentifier = BootUtils.getBootIdentifier(context)

//

//        messaging.onMessageDisplayed(nextMessage, currentBootUniqueIdentifier)

    }



    companion object {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { 


    override fun navToQuickSettingsSheet(tab: SessionState, sitePermissions: SitePermissions?) {

        val useCase = requireComponents.useCases.trackingProtectionUseCases

        FxNimbus.features.cookieBanners.recordExposure()

        // FxNimbus.features.cookieBanners.recordExposure()

        useCase.containsException(tab.id) { hasTrackingProtectionException ->

            lifecycleScope.launch {

                val cookieBannersStorage = requireComponents.core.cookieBannersStorage

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Analytics.kt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ import mozilla.components.lib.crash.service.MozillaSocorroService 
import mozilla.components.support.ktx.android.content.isMainProcess

import mozilla.components.support.utils.BrowsersCache

import mozilla.components.support.utils.RunWhenReadyQueue

import mozilla.components.service.nimbus.NimbusDisabled

import org.mozilla.fenix.nimbus.FxNimbus

import org.mozilla.fenix.BuildConfig

import org.mozilla.fenix.Config

import org.mozilla.fenix.HomeActivity

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ class HomeFragment : Fragment() { 


        activity.themeManager.applyStatusBarTheme(activity)



        FxNimbus.features.homescreen.recordExposure()

        // FxNimbus.features.homescreen.recordExposure()



        // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL!

        requireComponents.core.engine.profiler?.addMarker(