[android] Override settings (68f06ffc) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/fenix/app/nimbus.fml.yaml

+3 −3

Changes for mobile/android/fenix/app/nimbus.fml.yaml: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -691,13 +691,13 @@ features:
		defaults:
		- channel: developer
		value:
		enabled: true
		enabled: false
		- channel: nightly
		value:
		enabled: true
		enabled: false
		- channel: beta
		value:
		enabled: true
		enabled: false

		search-suggestions-on-homepage:
		description: Enables search suggestions on homepage.

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt

+17 −19

Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt: 17 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		*/
		var showBookmarksHomeFeature by lazyFeatureFlagPreference(
		appContext.getPreferenceKey(R.string.pref_key_customization_bookmarks),
		default = { homescreenSections[HomeScreenSection.BOOKMARKS] == true },
		default = { true },
		featureFlag = true,
		)

		@@ -191,7 +191,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		var showRecentTabsFeature by lazyFeatureFlagPreference(
		appContext.getPreferenceKey(R.string.pref_key_recent_tabs),
		featureFlag = true,
		default = { homescreenSections[HomeScreenSection.JUMP_BACK_IN] == true },
		default = { true },
		)

		/**
		@@ -200,7 +200,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		var showPocketRecommendationsFeature by lazyFeatureFlagPreference(
		appContext.getPreferenceKey(R.string.pref_key_pocket_homescreen_recommendations),
		featureFlag = ContentRecommendationsFeatureHelper.isContentRecommendationsFeatureEnabled(appContext),
		default = { homescreenSections[HomeScreenSection.POCKET] == true },
		default = { false },
		)

		/**
		@@ -217,7 +217,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		*/
		val showPocketSponsoredStories by lazyFeatureFlagPreference(
		key = appContext.getPreferenceKey(R.string.pref_key_pocket_sponsored_stories),
		default = { homescreenSections[HomeScreenSection.POCKET_SPONSORED_STORIES] == true },
		default = { false },
		featureFlag = ContentRecommendationsFeatureHelper.isPocketSponsoredStoriesFeatureEnabled(appContext),
		)

		@@ -226,7 +226,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		*/
		var historyMetadataUIFeature by lazyFeatureFlagPreference(
		appContext.getPreferenceKey(R.string.pref_key_history_metadata_feature),
		default = { homescreenSections[HomeScreenSection.RECENT_EXPLORATIONS] == true },
		default = { true },
		featureFlag = true,
		)

		@@ -257,7 +257,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		var showTopSitesFeature by lazyFeatureFlagPreference(
		appContext.getPreferenceKey(R.string.pref_key_show_top_sites),
		featureFlag = true,
		default = { homescreenSections[HomeScreenSection.TOP_SITES] == true },
		default = { false },
		)

		private val homescreenSections: Map<HomeScreenSection, Boolean>
		@@ -455,7 +455,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		var showWallpaperOnboarding by lazyFeatureFlagPreference(
		key = appContext.getPreferenceKey(R.string.pref_key_wallpapers_onboarding),
		featureFlag = true,
		default = { mr2022Sections[Mr2022Section.WALLPAPERS_SELECTION_TOOL] == true },
		default = { true },
		)

		var openLinksInAPrivateTab by booleanPreference(
		@@ -956,7 +956,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		var whatsappLinkSharingEnabled by lazyFeatureFlagPreference(
		key = appContext.getPreferenceKey(R.string.pref_key_link_sharing),
		featureFlag = true,
		default = { FxNimbus.features.sentFromFirefox.value().enabled },
		default = { false },
		)

		var linkSharingSettingsSnackbarShown by booleanPreference(
		@@ -1035,25 +1035,25 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		get() = false // cookieBannersSection[CookieBannersSection.FEATURE_UI] == 1

		val shouldEnableCookieBannerDetectOnly: Boolean
		get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_DETECT_ONLY] == 1
		get() = false

		val shouldEnableCookieBannerGlobalRules: Boolean
		get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_GLOBAL_RULES] == 1
		get() = false

		val shouldEnableCookieBannerGlobalRulesSubFrame: Boolean
		get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_GLOBAL_RULES_SUB_FRAMES] == 1
		get() = false

		val shouldEnableQueryParameterStripping: Boolean
		get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING] == "1"
		get() = true

		val shouldEnableQueryParameterStrippingPrivateBrowsing: Boolean
		get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_PMB] == "1"
		get() = true

		val queryParameterStrippingAllowList: String
		get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_ALLOW_LIST].orEmpty()
		get() = ""

		val queryParameterStrippingStripList: String
		get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_STRIP_LIST].orEmpty()
		get() = ""

		/**
		* Declared as a function for performance purposes. This could be declared as a variable using
		@@ -1111,8 +1111,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		* Indicates if the re-engagement notification feature is enabled
		*/
		val reEngagementNotificationType: Int
		get() =
		FxNimbus.features.reEngagementNotification.value().type
		get() = 0

		val shouldUseAutoBatteryTheme by booleanPreference(
		appContext.getPreferenceKey(R.string.pref_key_auto_battery_theme),
		@@ -2087,8 +2086,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
		isLauncherIntent: Boolean,
		): Boolean {
		return if (featureEnabled && !hasUserBeenOnboarded && isLauncherIntent) {
		FxNimbus.features.junoOnboarding.recordExposure()
		true
		false
		} else {
		false
		}

mobile/android/fenix/app/src/main/res/xml/preferences.xml

+1 −0

Changes for mobile/android/fenix/app/src/main/res/xml/preferences.xml: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@
		<androidx.preference.Preference
		android:key="@string/pref_key_link_sharing"
		app:iconSpaceReserved="false"
		app:isPreferenceVisible="false"
		android:title="@string/preferences_link_sharing" />

		<androidx.preference.Preference