Verified Commit 67a2d344 authored by Matthew Finkel's avatar Matthew Finkel Committed by jwilde
Browse files

TB 40016 [android]: Don't install WebCompat webext. 

Originally, fenix#40016.
parent 988fc818

mobile/android/fenix/.buildconfig.yml

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ projects: 
    - components:feature-toolbar

    - components:feature-top-sites

    - components:feature-webauthn

    - components:feature-webcompat

    - components:feature-webcompat-reporter

    # - components:feature-webcompat

    # - components:feature-webcompat-reporter

    - components:feature-webnotifications

    - components:lib-accelerometer-sensormanager

    - components:lib-crash

mobile/android/fenix/app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -609,8 +609,8 @@ dependencies { 
    implementation project(':components:feature-tabs')

    implementation project(':components:feature-top-sites')

    implementation project(':components:feature-webauthn')

    implementation project(':components:feature-webcompat')

    implementation project(':components:feature-webcompat-reporter')

    // implementation project(':components:feature-webcompat')

    // implementation project(':components:feature-webcompat-reporter')

    implementation project(':components:feature-webnotifications')

    implementation project(':components:service-digitalassetlinks')

    implementation project(':components:service-firefox-accounts')

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

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import mozilla.components.feature.search.ext.waitForSelectedOrDefaultSearchEngin 
import mozilla.components.feature.syncedtabs.commands.GlobalSyncedTabsCommandsProvider

import mozilla.components.feature.top.sites.TopSitesFrecencyConfig

import mozilla.components.feature.top.sites.TopSitesProviderConfig

import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature

// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature

import mozilla.components.lib.crash.CrashReporter

import mozilla.components.service.fxa.manager.SyncEnginesStorage

import mozilla.components.service.sync.autofill.GlobalAutofillDependencyProvider
@@ -868,7 +868,7 @@ open class FenixApplication : Application(), Provider, ThemeProvider { 
                    // TODO: Bug 1953359 - remove the code below in the next release.

                    if (Config.channel.isNightlyOrDebug || Config.channel.isBeta) {

                        logger.debug("Attempting to uninstall the WebCompat Reporter extension")

                        WebCompatReporterFeature.uninstall(components.core.engine)

                        // WebCompatReporterFeature.uninstall(components.core.engine)

                    }

                },

                onUpdatePermissionRequest = components.addonUpdater::onUpdatePermissionRequest,

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

+1 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ import mozilla.components.feature.sitepermissions.OnDiskSitePermissionsStorage 
import mozilla.components.feature.summarize.settings.SummarizationSettings

import mozilla.components.feature.top.sites.DefaultTopSitesStorage

import mozilla.components.feature.top.sites.PinnedSiteStorage

import mozilla.components.feature.webcompat.WebCompatFeature

import mozilla.components.feature.webnotifications.WebNotificationFeature

import mozilla.components.lib.dataprotect.SecureAbove22Preferences

import mozilla.components.service.digitalassetlinks.RelationChecker
@@ -256,7 +255,7 @@ class Core( 
            defaultSettings = defaultSettings,

            runtime = geckoRuntime,

        ).also {

            WebCompatFeature.install(it)

            // WebCompatFeature.install(it)

            TorBrowserFeatures.install(context, it)

        }

    }