tor-browser

commit 22b0d0162062c0b88a1221a3e0e56132ce42918f
parent c23d6ad2374cc078e1b4e6d07bd4369babde7f3b
Author: Matthew Finkel <sysrqb@torproject.org>
Date:   Wed,  2 Sep 2020 19:31:55 +0000

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

Originally, fenix#40016.

Diffstat:
M
mobile/android/fenix/.buildconfig.yml
 | 
4
++--
M
mobile/android/fenix/app/build.gradle
 | 
4
++--
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
 | 
4
++--
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
 | 
3
+--
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
 | 
9
---------

5 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/mobile/android/fenix/.buildconfig.yml b/mobile/android/fenix/.buildconfig.yml
@@ -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
diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle
@@ -617,8 +617,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')
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -48,7 +48,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
@@ -756,7 +756,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,
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -76,7 +76,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
@@ -238,7 +237,7 @@ class Core(
             defaultSettings,
             geckoRuntime,
         ).also {
-            WebCompatFeature.install(it)
+            // WebCompatFeature.install(it)
             TorBrowserFeatures.install(context, it)
         }
     }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -419,14 +419,6 @@ open class DefaultToolbarMenu(
         }
     }
 
-    private val reportBrokenSite = BrowserMenuImageText(
-        label = context.getString(R.string.browser_menu_webcompat_reporter),
-        imageResource = iconsR.drawable.mozac_ic_lightbulb_24,
-        iconTintColorResource = primaryTextColor(),
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.ReportBrokenSite)
-    }
-
     @VisibleForTesting(otherwise = PRIVATE)
     val coreMenuItems by lazy {
         val menuItems =
@@ -447,7 +439,6 @@ open class DefaultToolbarMenu(
                 // openInRegularTabItem.apply { visible = ::shouldShowOpenInRegularTab },
                 customizeReaderView.apply { visible = ::shouldShowReaderViewCustomization },
                 openInApp.apply { visible = ::shouldShowOpenInApp },
-                reportBrokenSite.apply { visible = ::shouldShowWebCompatReporter },
                 BrowserMenuDivider(),
                 addToHomeScreenItem.apply { visible = ::canAddToHomescreen },
                 addAppToHomeScreenItem.apply { visible = ::canAddAppToHomescreen },