mirror/IronFox
1
0
Fork 0
mirror of https://github.com/ironfox-oss/IronFox.git synced 2026-01-26 23:09:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
929e05ab7c8e1663aaa7fa6d1a5a71fa24ba40e6
IronFox/patches/remove-webcompat-reporter.patch
celenity 63a99045b4 WIP: v141.0 
Signed-off-by: celenity <celenity@celenity.dev>
2025-07-22 08:21:43 -04:00

152 lines
7.8 KiB
Diff
Raw Blame History

diff --git a/mobile/android/android-components/.buildconfig.yml b/mobile/android/android-components/.buildconfig.yml
index 489c138b0d..ecc26e15f8 100644
--- a/mobile/android/android-components/.buildconfig.yml
+++ b/mobile/android/android-components/.buildconfig.yml
@@ -1543,28 +1543,28 @@ projects:
- components:support-webextensions
- components:tooling-lint
- components:ui-icons
- components:feature-webcompat-reporter:
- description: Feature that enables users to report site issues to Mozilla's Web
- Compatibility team.
- path: components/feature/webcompat-reporter
- publish: true
- upstream_dependencies:
- - components:browser-errorpages
- - components:browser-state
- - components:concept-awesomebar
- - components:concept-base
- - components:concept-engine
- - components:concept-fetch
- - components:concept-storage
- - components:lib-publicsuffixlist
- - components:lib-state
- - components:support-base
- - components:support-ktx
- - components:support-test
- - components:support-utils
- - components:support-webextensions
- - components:tooling-lint
- - components:ui-icons
+# components:feature-webcompat-reporter:
+# description: Feature that enables users to report site issues to Mozilla's Web
+# Compatibility team.
+# path: components/feature/webcompat-reporter
+# publish: true
+# upstream_dependencies:
+# - components:browser-errorpages
+# - components:browser-state
+# - components:concept-awesomebar
+# - components:concept-base
+# - components:concept-engine
+# - components:concept-fetch
+# - components:concept-storage
+# - components:lib-publicsuffixlist
+# - components:lib-state
+# - components:support-base
+# - components:support-ktx
+# - components:support-test
+# - components:support-utils
+# - components:support-webextensions
+# - components:tooling-lint
+# - components:ui-icons
components:feature-webnotifications:
description: Feature component for Web Notifications.
path: components/feature/webnotifications
@@ -1767,7 +1767,7 @@ projects:
- components:feature-toolbar
- components:feature-top-sites
- components:feature-webcompat
- - components:feature-webcompat-reporter
+# - components:feature-webcompat-reporter
- components:feature-webnotifications
- components:lib-crash
- components:lib-dataprotect
diff --git a/mobile/android/android-components/samples/browser/build.gradle b/mobile/android/android-components/samples/browser/build.gradle
index 6ad158793d..3d4a033a0e 100644
--- a/mobile/android/android-components/samples/browser/build.gradle
+++ b/mobile/android/android-components/samples/browser/build.gradle
@@ -114,7 +114,7 @@ dependencies {
implementation project(':components:feature-findinpage')
implementation project(':components:feature-sitepermissions')
implementation project(':components:feature-webcompat')
- implementation project(':components:feature-webcompat-reporter')
+// implementation project(':components:feature-webcompat-reporter')
implementation project(':components:feature-webnotifications')
implementation project(':components:feature-addons')
diff --git a/mobile/android/fenix/.buildconfig.yml b/mobile/android/fenix/.buildconfig.yml
index 0620fba71e..2f6a78913f 100644
--- a/mobile/android/fenix/.buildconfig.yml
+++ b/mobile/android/fenix/.buildconfig.yml
@@ -59,7 +59,7 @@ projects:
- components:feature-top-sites
- components:feature-webauthn
- components:feature-webcompat
- - components:feature-webcompat-reporter
+# - 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
index 5bcd9c730b..eb5e4b109a 100644
--- a/mobile/android/fenix/app/build.gradle
+++ b/mobile/android/fenix/app/build.gradle
@@ -618,7 +618,7 @@ dependencies {
implementation project(':components:feature-webauthn')
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')
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/MenuDialogFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/MenuDialogFragment.kt
index a6bfa3a688..998d97b326 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/MenuDialogFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/MenuDialogFragment.kt
@@ -345,7 +345,7 @@ class MenuDialogFragment : BottomSheetDialogFragment() {
?.requestedTranslationPair?.toLanguage
val isExtensionsProcessDisabled = browserStore.state.extensionsProcessDisabled
val isWebCompatReporterSupported =
- FxNimbus.features.menuRedesign.value().reportSiteIssue
+ false
val isDesktopMode by store.observeAsState(initialValue = false) { state ->
state.isDesktopMode
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
index e7e19273f9..2e6139bd25 100644
--- 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
@@ -216,7 +216,7 @@ open class DefaultToolbarMenu(
val url = store.state.selectedTab?.content?.url
val isAboutUrl = url?.isAboutUrl() ?: false
val isContentUrl = url?.isContentUrl() ?: false
- return !isAboutUrl && !isContentUrl
+ return false
}
// End of predicates //
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
index a88ff8d3ac..ba902e3a42 100644
--- 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
@@ -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
@@ -701,7 +701,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,
Reference in New Issue View Git Blame Copy Permalink