GitLab

at 2022-05-18T12:16:05+02:00

fixup! Disable features and functionality

Bug 40212: Tor Browser crashing on launch

Merge branch 'bug_40212_2' into 'tor-browser-99.0.0b3-11.5-1'

Bug 40212: Disable more telemetry (especially, since it caused crashes)

See merge request tpo/applications/fenix!148
     @OptIn(DelicateCoroutinesApi::class) // GlobalScope usage

     protected open fun initializeGlean() {

         val telemetryEnabled = settings().isTelemetryEnabled

+        if (!telemetryEnabled) {

+            logger.debug("Preventing Glean from initializing, since telemetry is disabled")

+            return

+        }

         logger.debug("Initializing Glean (uploadEnabled=$telemetryEnabled, isFennec=${Config.channel.isFennec})")

 import mozilla.components.service.glean.Glean

 import mozilla.components.service.glean.private.NoExtraKeys

 import mozilla.components.support.base.log.logger.Logger

+import org.mozilla.fenix.BuildConfig

 import org.mozilla.fenix.GleanMetrics.Addons

 import org.mozilla.fenix.GleanMetrics.AndroidAutofill

 import org.mozilla.fenix.GleanMetrics.AppTheme

     }

     fun track(event: Event) {

+        if (BuildConfig.DATA_COLLECTION_DISABLED) {

+            return

+        }

         val extras = if (keyMapper != null) {

             event.extras?.mapKeys { (key) ->

                 keyMapper.invoke(key.toString().asCamelCase())

     private val installationPing = FirstSessionPing(context)

     override fun start() {

+        if (BuildConfig.DATA_COLLECTION_DISABLED) {

+            Logger.debug("Data collection is disabled, not initializing Glean.")

+            initialized = true

+            return

+        }

+

         logger.debug("Enabling Glean.")

         // Initialization of Glean already happened in FenixApplication.

         Glean.setUploadEnabled(true)

     }

     override fun track(event: Event) {

-        event.wrapper?.track(event)

+        if (!BuildConfig.DATA_COLLECTION_DISABLED) {

+            event.wrapper?.track(event)

+        }

     }

     override fun shouldTrack(event: Event): Boolean {

-        return event.wrapper != null

+        return !BuildConfig.DATA_COLLECTION_DISABLED && event.wrapper != null

     }

 }

     private fun isInitialized(type: MetricServiceType): Boolean = initialized.contains(type)

-    private fun isTelemetryEnabled(@Suppress("UNUSED_PARAMETER") type: MetricServiceType): Boolean = false

+    private fun isTelemetryEnabled(type: MetricServiceType): Boolean =

+        !BuildConfig.DATA_COLLECTION_DISABLED && when (type) {

+            MetricServiceType.Data -> isDataTelemetryEnabled()

+            MetricServiceType.Marketing -> isMarketingDataTelemetryEnabled()

+        }

     @Suppress("LongMethod", "MaxLineLength")

     private fun Fact.toEvent(): Event? = when {

Matthew Finkel pushed to branch tor-browser-99.0.0b3-11.5-1 at The Tor Project / Applications / fenix

Commits:

3 changed files:

Changes: