Commit 7c5913b8 authored by Matthew Finkel's avatar Matthew Finkel Committed by brizental
Browse files

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

Originally, fenix#40016.
parent 05bcad46

mobile/android/fenix/.buildconfig.yml

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,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-crash

    - components:lib-crash-sentry

mobile/android/fenix/app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -639,9 +639,9 @@ dependencies { 
    implementation project(':components:feature-share')

    implementation project(':components:feature-accounts-push')

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

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

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

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

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

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



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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,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.logins.LoginsApiException
@@ -706,7 +706,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider { 
                    // 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.session.middleware.undo.UndoMiddleware 
import mozilla.components.feature.sitepermissions.OnDiskSitePermissionsStorage

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
@@ -230,7 +229,7 @@ class Core( 
            defaultSettings,

            geckoRuntime,

        ).also {

            WebCompatFeature.install(it)

            // WebCompatFeature.install(it)

            TorBrowserFeatures.install(context, it)

        }

    }

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

+8 −8
Original line number Diff line number Diff line
@@ -420,13 +420,13 @@ open class DefaultToolbarMenu( 
        }

    }



    private val reportBrokenSite = BrowserMenuImageText(

        label = context.getString(R.string.browser_menu_webcompat_reporter),

        imageResource = R.drawable.mozac_ic_lightbulb_24,

        iconTintColorResource = primaryTextColor(),

    ) {

        onItemTapped.invoke(ToolbarMenu.Item.ReportBrokenSite)

    }

    // private val reportBrokenSite = BrowserMenuImageText(

    //     label = context.getString(R.string.browser_menu_webcompat_reporter),

    //     imageResource = R.drawable.mozac_ic_lightbulb_24,

    //     iconTintColorResource = primaryTextColor(),

    // ) {

    //     onItemTapped.invoke(ToolbarMenu.Item.ReportBrokenSite)

    // }



    @VisibleForTesting(otherwise = PRIVATE)

    val coreMenuItems by lazy {
@@ -448,7 +448,7 @@ open class DefaultToolbarMenu( 
                // openInRegularTabItem.apply { visible = ::shouldShowOpenInRegularTab },

                customizeReaderView.apply { visible = ::shouldShowReaderViewCustomization },

                openInApp.apply { visible = ::shouldShowOpenInApp },

                reportBrokenSite.apply { visible = ::shouldShowWebCompatReporter },

                // reportBrokenSite.apply { visible = ::shouldShowWebCompatReporter },

                BrowserMenuDivider(),

                addToHomeScreenItem.apply { visible = ::canAddToHomescreen },

                addAppToHomeScreenItem.apply { visible = ::canAddAppToHomescreen },