TB 40016 [android]: Don't install WebCompat webext. (67ffac70) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/fenix/.buildconfig.yml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -56,8 +56,8 @@ projects:
	- feature-toolbar		- feature-toolbar
	- feature-top-sites		- feature-top-sites
	- feature-webauthn		- feature-webauthn
	- feature-webcompat		# - feature-webcompat
	- feature-webcompat-reporter		# - feature-webcompat-reporter
	- feature-webnotifications		- feature-webnotifications
	- lib-crash		- lib-crash
	- lib-crash-sentry		- lib-crash-sentry

mobile/android/fenix/app/build.gradle

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -635,9 +635,9 @@ dependencies {
	implementation project(':feature-share')		implementation project(':feature-share')
	implementation project(':feature-accounts-push')		implementation project(':feature-accounts-push')
	implementation project(':feature-webauthn')		implementation project(':feature-webauthn')
	implementation project(':feature-webcompat')		// implementation project(':feature-webcompat')
	implementation project(':feature-webnotifications')		implementation project(':feature-webnotifications')
	implementation project(':feature-webcompat-reporter')		// implementation project(':feature-webcompat-reporter')

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

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

+6 −6

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

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -71,8 +71,8 @@ import mozilla.components.feature.session.middleware.undo.UndoMiddleware
	import mozilla.components.feature.sitepermissions.OnDiskSitePermissionsStorage		import mozilla.components.feature.sitepermissions.OnDiskSitePermissionsStorage
	import mozilla.components.feature.top.sites.DefaultTopSitesStorage		import mozilla.components.feature.top.sites.DefaultTopSitesStorage
	import mozilla.components.feature.top.sites.PinnedSiteStorage		import mozilla.components.feature.top.sites.PinnedSiteStorage
	import mozilla.components.feature.webcompat.WebCompatFeature		// import mozilla.components.feature.webcompat.WebCompatFeature
	import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature		// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
	import mozilla.components.feature.webnotifications.WebNotificationFeature		import mozilla.components.feature.webnotifications.WebNotificationFeature
	import mozilla.components.lib.dataprotect.SecureAbove22Preferences		import mozilla.components.lib.dataprotect.SecureAbove22Preferences
	import mozilla.components.service.contile.ContileTopSitesProvider		import mozilla.components.service.contile.ContileTopSitesProvider
	@@ -165,7 +165,7 @@ class Core(
	defaultSettings,		defaultSettings,
	geckoRuntime,		geckoRuntime,
	).also {		).also {
	WebCompatFeature.install(it)		// WebCompatFeature.install(it)

	/**		/**
	* There are some issues around localization to be resolved, as well as questions around		* There are some issues around localization to be resolved, as well as questions around
	@@ -173,9 +173,9 @@ class Core(
	* disabled in Fenix Release builds for now.		* disabled in Fenix Release builds for now.
	* This is consistent with both Fennec and Firefox Desktop.		* This is consistent with both Fennec and Firefox Desktop.
	*/		*/
	if (Config.channel.isNightlyOrDebug \|\| Config.channel.isBeta) {		// if (Config.channel.isNightlyOrDebug \|\| Config.channel.isBeta) {
	WebCompatReporterFeature.install(it, "fenix")		// WebCompatReporterFeature.install(it, "fenix")
	}		// }

	TorBrowserFeatures.install(context, it)		TorBrowserFeatures.install(context, it)
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ import mozilla.components.browser.state.state.TabSessionState
	import mozilla.components.browser.state.store.BrowserStore		import mozilla.components.browser.state.store.BrowserStore
	import mozilla.components.concept.storage.BookmarksStorage		import mozilla.components.concept.storage.BookmarksStorage
	import mozilla.components.feature.top.sites.PinnedSiteStorage		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.lib.state.ext.flowScoped
	import mozilla.components.support.ktx.android.content.getColorFromAttr		import mozilla.components.support.ktx.android.content.getColorFromAttr
	import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged		import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
	@@ -294,10 +294,10 @@ open class DefaultToolbarMenu(
	onItemTapped.invoke(ToolbarMenu.Item.OpenInApp)		onItemTapped.invoke(ToolbarMenu.Item.OpenInApp)
	}		}

	private val reportSiteIssuePlaceholder = WebExtensionPlaceholderMenuItem(		//private val reportSiteIssuePlaceholder = WebExtensionPlaceholderMenuItem(
	id = WebCompatReporterFeature.WEBCOMPAT_REPORTER_EXTENSION_ID,		// id = WebCompatReporterFeature.WEBCOMPAT_REPORTER_EXTENSION_ID,
	iconTintColorResource = primaryTextColor(),		// iconTintColorResource = primaryTextColor(),
	)		//)

	private val addToHomeScreenItem = BrowserMenuImageText(		private val addToHomeScreenItem = BrowserMenuImageText(
	label = context.getString(R.string.browser_menu_add_to_homescreen),		label = context.getString(R.string.browser_menu_add_to_homescreen),
	@@ -423,7 +423,7 @@ open class DefaultToolbarMenu(
	// openInRegularTabItem.apply { visible = ::shouldShowOpenInRegularTab },		// openInRegularTabItem.apply { visible = ::shouldShowOpenInRegularTab },
	customizeReaderView.apply { visible = ::shouldShowReaderViewCustomization },		customizeReaderView.apply { visible = ::shouldShowReaderViewCustomization },
	openInApp.apply { visible = ::shouldShowOpenInApp },		openInApp.apply { visible = ::shouldShowOpenInApp },
	reportSiteIssuePlaceholder,		// reportSiteIssuePlaceholder,
	BrowserMenuDivider(),		BrowserMenuDivider(),
	addToHomeScreenItem.apply { visible = ::canAddToHomescreen },		addToHomeScreenItem.apply { visible = ::canAddToHomescreen },
	if (shouldShowTopSites) addRemoveTopSitesItem else null,		if (shouldShowTopSites) addRemoveTopSitesItem else null,