mirror/IronFox
1
0
Fork 0
mirror of https://github.com/ironfox-oss/IronFox.git synced 2026-06-11 09:44:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
497f138386452f8dd90b2ede1571dcafe1e837cb
IronFox/patches/remove-webcompat-reporter.patch
celenity ad5d91b988 fix: Update remove-webcompat-reporter.patch for 138 
Signed-off-by: celenity <celenity@celenity.dev>
2025-04-29 00:20:07 -04:00

189 lines
9.5 KiB
Diff
Raw Blame History

From 4279898097c771367f86897c4d48a0e0d1e575b1 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Mon, 28 Apr 2025 11:37:38 +0530
Subject: [PATCH] fix(patches): update 'remove-webcompat-reporter.patch' for
'FIREFOX_138_0_BUILD1'
Signed-off-by: Akash Yadav <itsaky01@gmail.com>
---
.../android-components/.buildconfig.yml | 23 -------------------
.../samples/browser/build.gradle | 1 -
mobile/android/fenix/.buildconfig.yml | 1 -
mobile/android/fenix/app/build.gradle | 1 -
.../java/org/mozilla/fenix/FeatureFlags.kt | 2 +-
.../components/menu/MenuDialogFragment.kt | 3 +--
.../fenix/components/menu/compose/MainMenu.kt | 4 ++--
.../components/toolbar/DefaultToolbarMenu.kt | 5 +---
8 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/mobile/android/android-components/.buildconfig.yml b/mobile/android/android-components/.buildconfig.yml
index 26e76a18d2..8ee7e10a15 100644
--- a/mobile/android/android-components/.buildconfig.yml
+++ b/mobile/android/android-components/.buildconfig.yml
@@ -1521,28 +1521,6 @@ projects:
- support-webextensions
- tooling-lint
- ui-icons
- 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:
- - browser-errorpages
- - browser-state
- - concept-awesomebar
- - concept-base
- - concept-engine
- - concept-fetch
- - concept-storage
- - lib-publicsuffixlist
- - lib-state
- - support-base
- - support-ktx
- - support-test
- - support-utils
- - support-webextensions
- - tooling-lint
- - ui-icons
feature-webnotifications:
description: Feature component for Web Notifications.
path: components/feature/webnotifications
@@ -1744,7 +1722,6 @@ projects:
- feature-toolbar
- feature-top-sites
- feature-webcompat
- - feature-webcompat-reporter
- feature-webnotifications
- lib-crash
- lib-dataprotect
diff --git a/mobile/android/android-components/samples/browser/build.gradle b/mobile/android/android-components/samples/browser/build.gradle
index bd70dd476b..bf43d5834e 100644
--- a/mobile/android/android-components/samples/browser/build.gradle
+++ b/mobile/android/android-components/samples/browser/build.gradle
@@ -114,7 +114,6 @@ dependencies {
implementation project(':feature-findinpage')
implementation project(':feature-sitepermissions')
implementation project(':feature-webcompat')
- implementation project(':feature-webcompat-reporter')
implementation project(':feature-webnotifications')
implementation project(':feature-addons')
diff --git a/mobile/android/fenix/.buildconfig.yml b/mobile/android/fenix/.buildconfig.yml
index b5aa2ce3a4..4aefd0fc43 100644
--- a/mobile/android/fenix/.buildconfig.yml
+++ b/mobile/android/fenix/.buildconfig.yml
@@ -59,7 +59,6 @@ projects:
- feature-top-sites
- feature-webauthn
- feature-webcompat
- - feature-webcompat-reporter
- feature-webnotifications
- lib-crash
- lib-crash-sentry
diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle
index 7535453460..160ac8422e 100644
--- a/mobile/android/fenix/app/build.gradle
+++ b/mobile/android/fenix/app/build.gradle
@@ -634,7 +634,6 @@ dependencies {
implementation project(':feature-webauthn')
implementation project(':feature-webcompat')
implementation project(':feature-webnotifications')
- implementation project(':feature-webcompat-reporter')
implementation project(':service-pocket')
implementation project(':service-mars')
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 7f435ae784..ba6576a5db 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -81,7 +81,7 @@ object FeatureFlags {
/**
* Enables native WebCompat Reporter.
*/
- const val webCompatReporter = true
+ const val webCompatReporter = false
/**
* Enables the tab swipe to dismiss rewrite.
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 514f270d17..25ec170e81 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
@@ -312,8 +312,7 @@ class MenuDialogFragment : BottomSheetDialogFragment() {
val translateLanguageCode = selectedTab?.translationsState?.translationEngineState
?.requestedTranslationPair?.toLanguage
val isExtensionsProcessDisabled = browserStore.state.extensionsProcessDisabled
- val isWebCompatReporterSupported =
- FxNimbus.features.menuRedesign.value().reportSiteIssue
+ val isWebCompatReporterSupported = 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/menu/compose/MainMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt
index 136ddf0fda..40534be709 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt
@@ -396,7 +396,7 @@ private fun MenuDialogPreview() {
isDesktopMode = false,
isPdf = false,
isTranslationSupported = true,
- isWebCompatReporterSupported = true,
+ isWebCompatReporterSupported = false,
showQuitMenu = true,
isExtensionsProcessDisabled = true,
extensionsMenuItemDescription = "No extensions enabled",
@@ -439,7 +439,7 @@ private fun MenuDialogPrivatePreview() {
isDesktopMode = false,
isPdf = false,
isTranslationSupported = true,
- isWebCompatReporterSupported = true,
+ isWebCompatReporterSupported = false,
showQuitMenu = true,
isExtensionsProcessDisabled = false,
extensionsMenuItemDescription = "No extensions enabled",
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 92c7c8b36c..7223a6de8e 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,10 +216,7 @@ open class DefaultToolbarMenu(
* Return whether Report Broken Site menu item is visible
*/
private fun shouldShowWebCompatReporter(): Boolean {
- 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 34a3e1b522..c869b47637 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,6 @@ 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.lib.crash.CrashReporter
import mozilla.components.service.fxa.manager.SyncEnginesStorage
import mozilla.components.service.sync.logins.LoginsApiException
@@ -678,15 +677,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
onExtensionsLoaded = { extensions ->
components.addonUpdater.registerForFutureUpdates(extensions)
subscribeForNewAddonsIfNeeded(components.supportedAddonsChecker, extensions)
-
- // Bug 1948634 - Make sure the webcompat-reporter extension is fully uninstalled.
- // This is added here because we need gecko to load the extension first.
- //
- // 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)
- }
},
onUpdatePermissionRequest = components.addonUpdater::onUpdatePermissionRequest,
)
Reference in New Issue View Git Blame Copy Permalink