Skip to content
Snippets Groups Projects
Commit 988c9bd9 authored by Matthew Finkel's avatar Matthew Finkel Committed by Pier Angelo Vendrame
Browse files

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

Originally, fenix#40016.
parent 2b6eb3dc
Branches
Tags
1 merge request!1500TB 43415: Rebased onto 134.0a1
......@@ -56,8 +56,8 @@ projects:
- feature-toolbar
- feature-top-sites
- feature-webauthn
- feature-webcompat
- feature-webcompat-reporter
# - feature-webcompat
# - feature-webcompat-reporter
- feature-webnotifications
- lib-crash
- lib-crash-sentry
......
......@@ -644,9 +644,9 @@ dependencies {
implementation project(':feature-share')
implementation project(':feature-accounts-push')
implementation project(':feature-webauthn')
implementation project(':feature-webcompat')
// implementation project(':feature-webcompat')
implementation project(':feature-webnotifications')
implementation project(':feature-webcompat-reporter')
// implementation project(':feature-webcompat-reporter')
implementation project(':service-pocket')
implementation project(':service-contile')
......
......@@ -72,8 +72,8 @@ 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.webcompat.reporter.WebCompatReporterFeature
// import mozilla.components.feature.webcompat.WebCompatFeature
// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
import mozilla.components.feature.webnotifications.WebNotificationFeature
import mozilla.components.lib.dataprotect.SecureAbove22Preferences
import mozilla.components.service.contile.ContileTopSitesProvider
......@@ -203,7 +203,7 @@ class Core(
defaultSettings,
geckoRuntime,
).also {
WebCompatFeature.install(it)
// WebCompatFeature.install(it)
/**
* There are some issues around localization to be resolved, as well as questions around
......@@ -211,9 +211,9 @@ class Core(
* disabled in Fenix Release builds for now.
* This is consistent with both Fennec and Firefox Desktop.
*/
if (Config.channel.isNightlyOrDebug || Config.channel.isBeta) {
WebCompatReporterFeature.install(it, "fenix")
}
// if (Config.channel.isNightlyOrDebug || Config.channel.isBeta) {
// WebCompatReporterFeature.install(it, "fenix")
// }
TorBrowserFeatures.install(context, it)
}
......
......@@ -32,7 +32,7 @@ import mozilla.components.browser.state.state.TabSessionState
import mozilla.components.browser.state.store.BrowserStore
import mozilla.components.concept.storage.BookmarksStorage
import mozilla.components.feature.top.sites.PinnedSiteStorage
import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
import mozilla.components.lib.state.ext.flowScoped
import mozilla.components.support.ktx.android.content.getColorFromAttr
import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
......@@ -303,10 +303,10 @@ open class DefaultToolbarMenu(
onItemTapped.invoke(ToolbarMenu.Item.OpenInApp)
}
private val reportSiteIssuePlaceholder = WebExtensionPlaceholderMenuItem(
id = WebCompatReporterFeature.WEBCOMPAT_REPORTER_EXTENSION_ID,
iconTintColorResource = primaryTextColor(),
)
//private val reportSiteIssuePlaceholder = WebExtensionPlaceholderMenuItem(
// id = WebCompatReporterFeature.WEBCOMPAT_REPORTER_EXTENSION_ID,
// iconTintColorResource = primaryTextColor(),
//)
private val addToHomeScreenItem = BrowserMenuImageText(
label = context.getString(R.string.browser_menu_add_to_homescreen),
......@@ -437,7 +437,7 @@ open class DefaultToolbarMenu(
// openInRegularTabItem.apply { visible = ::shouldShowOpenInRegularTab },
customizeReaderView.apply { visible = ::shouldShowReaderViewCustomization },
openInApp.apply { visible = ::shouldShowOpenInApp },
reportSiteIssuePlaceholder,
// reportSiteIssuePlaceholder,
BrowserMenuDivider(),
addToHomeScreenItem.apply { visible = ::canAddToHomescreen },
addAppToHomeScreenItem.apply { visible = ::canAddAppToHomescreen },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment