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/disable-pocket.patch
Akash Yadav 594a32fc0e fix(patches): update patches for v138.0-build1 
Signed-off-by: Akash Yadav <itsaky01@gmail.com>
2025-04-28 11:56:29 +05:30

255 lines
13 KiB
Diff
Raw Blame History

From cebeca153ce6d606b73f7171907ed7724763ae36 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Mon, 28 Apr 2025 10:57:35 +0530
Subject: [PATCH] fix(patches): update 'disable-pocket.patch' for
'FIREFOX_138_0_BUILD1'
Signed-off-by: Akash Yadav <itsaky01@gmail.com>
---
.../service/mars/MarsTopSitesProvider.kt | 4 +--
.../mars/contile/ContileTopSitesProvider.kt | 4 +--
.../pocket/spocs/api/SpocsEndpointRaw.kt | 4 +--
mobile/android/fenix/app/nimbus.fml.yaml | 6 ++--
.../java/org/mozilla/fenix/FeatureFlags.kt | 8 +++---
.../fenix/settings/SecretSettingsFragment.kt | 5 ++--
.../mozilla/fenix/settings/SupportUtils.kt | 2 +-
.../java/org/mozilla/fenix/utils/Settings.kt | 28 ++++---------------
.../app/src/main/res/xml/home_preferences.xml | 9 ++++--
9 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/mobile/android/android-components/components/service/mars/src/main/java/mozilla/components/service/mars/MarsTopSitesProvider.kt b/mobile/android/android-components/components/service/mars/src/main/java/mozilla/components/service/mars/MarsTopSitesProvider.kt
index b8430171ec..63f92e4dde 100644
--- a/mobile/android/android-components/components/service/mars/src/main/java/mozilla/components/service/mars/MarsTopSitesProvider.kt
+++ b/mobile/android/android-components/components/service/mars/src/main/java/mozilla/components/service/mars/MarsTopSitesProvider.kt
@@ -29,14 +29,14 @@ import java.io.File
import java.io.IOException
import java.util.Date
-private const val MARS_ENDPOINT_URL = "https://ads.mozilla.org/v1/ads"
+private const val MARS_ENDPOINT_URL = ""
private const val REQUEST_BODY_CONTEXT_ID_KEY = "context_id"
private const val REQUEST_BODY_PLACEMENTS_KEY = "placements"
private const val REQUEST_BODY_PLACEMENT_KEY = "placement"
private const val REQUEST_BODY_COUNT_KEY = "count"
-internal const val CACHE_FILE_NAME = "mozilla_components_service_mars_tiles.json"
+internal const val CACHE_FILE_NAME = ""
/**
* Provides access to the MARS API for fetching top sites tile.
diff --git a/mobile/android/android-components/components/service/mars/src/main/java/mozilla/components/service/mars/contile/ContileTopSitesProvider.kt b/mobile/android/android-components/components/service/mars/src/main/java/mozilla/components/service/mars/contile/ContileTopSitesProvider.kt
index 6f1de67d54..5037c18b66 100644
--- a/mobile/android/android-components/components/service/mars/src/main/java/mozilla/components/service/mars/contile/ContileTopSitesProvider.kt
+++ b/mobile/android/android-components/components/service/mars/src/main/java/mozilla/components/service/mars/contile/ContileTopSitesProvider.kt
@@ -29,8 +29,8 @@ import java.io.File
import java.io.IOException
import java.util.Date
-internal const val CONTILE_ENDPOINT_URL = "https://contile.services.mozilla.com/v1/tiles"
-internal const val CACHE_FILE_NAME = "mozilla_components_service_contile.json"
+internal const val CONTILE_ENDPOINT_URL = ""
+internal const val CACHE_FILE_NAME = ""
internal const val CACHE_VALID_FOR_KEY = "valid_for"
internal const val CACHE_TOP_SITES_KEY = "tiles"
diff --git a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/spocs/api/SpocsEndpointRaw.kt b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/spocs/api/SpocsEndpointRaw.kt
index 81bf2dd7e2..7a43fac926 100644
--- a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/spocs/api/SpocsEndpointRaw.kt
+++ b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/spocs/api/SpocsEndpointRaw.kt
@@ -24,8 +24,8 @@ import org.json.JSONObject
import java.io.IOException
import java.util.UUID
-private const val SPOCS_ENDPOINT_DEV_BASE_URL = "https://spocs.getpocket.dev/"
-private const val SPOCS_ENDPOINT_PROD_BASE_URL = "https://spocs.getpocket.com/"
+private const val SPOCS_ENDPOINT_DEV_BASE_URL = ""
+private const val SPOCS_ENDPOINT_PROD_BASE_URL = ""
private const val SPOCS_ENDPOINT_DOWNLOAD_SPOCS_PATH = "spocs"
private const val SPOCS_ENDPOINT_DELETE_PROFILE_PATH = "user"
private const val SPOCS_PROXY_VERSION_KEY = "version"
diff --git a/mobile/android/fenix/app/nimbus.fml.yaml b/mobile/android/fenix/app/nimbus.fml.yaml
index 0f3e80dad2..53b102b8f4 100644
--- a/mobile/android/fenix/app/nimbus.fml.yaml
+++ b/mobile/android/fenix/app/nimbus.fml.yaml
@@ -48,9 +48,9 @@ features:
"jump-back-in": true,
"bookmarks": true,
"recent-explorations": true,
- "pocket": true,
- "pocket-sponsored-stories": true,
"synced-tabs": true,
+ "pocket": false,
+ "pocket-sponsored-stories": false,
}
defaults:
- channel: nightly
@@ -60,8 +60,8 @@ features:
"jump-back-in": true,
"bookmarks": true,
"recent-explorations": true,
- "pocket": true,
"synced-tabs": true,
+ "pocket": false,
}
}
nimbus-validation:
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..e7e801db8d 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
@@ -34,17 +34,17 @@ object FeatureFlags {
/**
* Show Pocket recommended stories on home.
*/
+ @Suppress("UNUSED_PARAMETER")
fun isPocketRecommendationsFeatureEnabled(context: Context): Boolean {
- val langTag = LocaleManager.getCurrentLocale(context)
- ?.toLanguageTag() ?: getSystemDefault().toLanguageTag()
- return listOf("en-US", "en-CA").contains(langTag)
+ return false
}
/**
* Show Pocket sponsored stories in between Pocket recommended stories on home.
*/
+ @Suppress("UNUSED_PARAMETER")
fun isPocketSponsoredStoriesFeatureEnabled(context: Context): Boolean {
- return isPocketRecommendationsFeatureEnabled(context)
+ return false
}
/**
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
index aafe4dbe47..2dd7f76bc8 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
@@ -108,7 +108,8 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
}
requirePreference<SwitchPreference>(R.string.pref_key_mars_api_enabled).apply {
- isChecked = context.settings().marsAPIEnabled
+ isVisible = false
+ isChecked = false
onPreferenceChangeListener = object : SharedPreferenceUpdater() {
override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
activity?.recreate()
@@ -203,7 +204,7 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
}
requirePreference<Preference>(R.string.pref_key_custom_sponsored_stories_parameters).apply {
- isVisible = Config.channel.isNightlyOrDebug
+ isVisible = false
}
requirePreference<SwitchPreference>(R.string.pref_key_remote_server_prod).apply {
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
index 598a24ce36..f401c7b820 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -22,7 +22,7 @@ import java.util.Locale
object SupportUtils {
const val RATE_APP_URL = "market://details?id=" + BuildConfig.APPLICATION_ID
- const val POCKET_TRENDING_URL = "https://getpocket.com/fenix-top-articles"
+ const val POCKET_TRENDING_URL = ""
const val WIKIPEDIA_URL = "https://www.wikipedia.org/"
const val FENIX_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}"
const val GOOGLE_URL = "https://www.google.com/"
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 8e271198b0..c8de5b7e96 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -370,10 +370,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
default = false,
)
- var showCollectionsPlaceholderOnHome by booleanPreference(
- appContext.getPreferenceKey(R.string.pref_key_show_collections_placeholder_home),
- default = true,
- )
+ var showCollectionsPlaceholderOnHome = false
val isCrashReportingEnabled: Boolean
get() = isCrashReportEnabledInBuild &&
@@ -1738,20 +1735,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
/**
* Indicates if the Pocket recommended stories homescreen section should be shown.
*/
- var showPocketRecommendationsFeature by lazyFeatureFlagPreference(
- appContext.getPreferenceKey(R.string.pref_key_pocket_homescreen_recommendations),
- featureFlag = FeatureFlags.isPocketRecommendationsFeatureEnabled(appContext),
- default = { homescreenSections[HomeScreenSection.POCKET] == true },
- )
+ var showPocketRecommendationsFeature = false
/**
* Indicates if the Pocket recommendations homescreen section should also show sponsored stories.
*/
- val showPocketSponsoredStories by lazyFeatureFlagPreference(
- key = appContext.getPreferenceKey(R.string.pref_key_pocket_sponsored_stories),
- default = { homescreenSections[HomeScreenSection.POCKET_SPONSORED_STORIES] == true },
- featureFlag = FeatureFlags.isPocketSponsoredStoriesFeatureEnabled(appContext),
- )
+ val showPocketSponsoredStories = false
/**
* Get the profile id to use in the sponsored stories communications with the Pocket endpoint.
@@ -1815,19 +1804,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
/**
* Indicates if the MARS API integration is used for sponsored content.
*/
- var marsAPIEnabled by lazyFeatureFlagPreference(
- key = appContext.getPreferenceKey(R.string.pref_key_mars_api_enabled),
- default = { FxNimbus.features.mars.value().enabled },
- featureFlag = true,
- )
+ var marsAPIEnabled = false
/**
* Indicates if the Contile functionality should be visible.
*/
- var showContileFeature by booleanPreference(
- key = appContext.getPreferenceKey(R.string.pref_key_enable_contile),
- default = true,
- )
+ var showContileFeature = false
/**
* Indicates if the Unified Search feature should be visible.
diff --git a/mobile/android/fenix/app/src/main/res/xml/home_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/home_preferences.xml
index 5ca4cff86d..3507b6d24e 100644
--- a/mobile/android/fenix/app/src/main/res/xml/home_preferences.xml
+++ b/mobile/android/fenix/app/src/main/res/xml/home_preferences.xml
@@ -13,7 +13,8 @@
android:dependency="@string/pref_key_show_top_sites"
android:layout="@layout/checkbox_left_sub_preference"
android:key="@string/pref_key_enable_contile"
- android:title="@string/customize_toggle_contile" />
+ android:title="@string/customize_toggle_contile"
+ app:isPreferenceVisible="false" />
<androidx.preference.SwitchPreference
android:key="@string/pref_key_recent_tabs"
@@ -30,13 +31,15 @@
<androidx.preference.SwitchPreference
android:key="@string/pref_key_pocket_homescreen_recommendations"
android:title="@string/customize_toggle_pocket_2"
- android:summary="@string/customize_toggle_pocket_summary" />
+ android:summary="@string/customize_toggle_pocket_summary"
+ app:isPreferenceVisible="false" />
<androidx.preference.CheckBoxPreference
android:dependency="@string/pref_key_pocket_homescreen_recommendations"
android:layout="@layout/checkbox_left_sub_preference"
android:key="@string/pref_key_pocket_sponsored_stories"
- android:title="@string/customize_toggle_pocket_sponsored" />
+ android:title="@string/customize_toggle_pocket_sponsored"
+ app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:key="@string/pref_key_wallpapers"
--
2.49.0
Reference in New Issue View Git Blame Copy Permalink