GitLab

at 2026-07-21T19:10:38-07:00

fixup! [android] Disable features and functionality

Bug 45118: Disable Mozilla VPN

             summarizeToolbarHighlightBinding,

             components.core.summarizationSettings,

             translationsAIControllableFeatureRegistrar,

-            ipProtectionPrompter,

         )

         if (!isCustomTabIntent(intent)) {

             }

         }

-        if (showIPProtection) {

+        if (false) {

             MenuGroup {

                 IPProtectionMenuItem(

                     state = ipProtectionMenuState,

                 showBanner = true,

                 isDownloadHighlighted = true,

                 webExtensionMenuCount = 1,

-                showIPProtection = true,

+                showIPProtection = false,

                 ipProtectionMenuState = IPProtectionMenuState(),

                 onMoreMenuClick = {},

                 onCustomizeReaderViewMenuClick = {},

         initReviewPromptBinding(view = view)

         initTabsCleanupFeature(view = view)

         initSnackbarBinding(view = view)

-        initIpProtectionBindings(view = view)

         privacyNoticeBannerStore = PrivacyNoticeBannerStore(

             initialState = PrivacyNoticeBannerState(

             onPreferenceChangeListener = SharedPreferenceUpdater()

         }

-        requirePreference<SwitchPreferenceCompat>(R.string.pref_key_enable_ip_protection).apply {

-            isVisible = Config.channel.isNightlyOrDebug

-            isChecked = settings.isIPProtectionEnabled

-            onPreferenceChangeListener = SharedPreferenceUpdater()

-        }

-

         requirePreference<SwitchPreferenceCompat>(R.string.pref_key_enable_import_passwords).apply {

             isVisible = Config.channel.isDebug

             isChecked = settings.importPasswordsFeatureFlagEnabled

                 SettingsFragmentDirections.actionSettingsFragmentToHttpsOnlyFragment()

             }

-            resources.getString(R.string.pref_key_ip_protection_settings) -> {

-                Vpn.settingsPageTapped.record(Vpn.SettingsPageTappedExtra(entrypoint = "Settings"))

-                SettingsFragmentDirections.actionSettingsFragmentToIpProtectionFragment(

-                    entrypoint = FenixFxAEntryPoint.IPProtectionSettings,

-                )

-            }

-

             resources.getString(R.string.pref_key_tracking_protection_settings) -> {

                 TrackingProtection.etpSettings.record(NoExtras())

                 SettingsFragmentDirections.actionSettingsFragmentToTrackingProtectionFragment()

         setupGeckoLogsPreference(settings)

         setupSecurityLevelPreference()

         setupHttpsOnlyPreferences(settings)

-        setupIPProtectionPreferences(components.ipProtection.store)

         setupNotificationPreference(

             NotificationManagerCompat.from(requireContext()).areNotificationsEnabled(),

         )

      * Persists IPProtection state set through Secret Settings.

      *

      * `true` makes the IPProtection UI elements visible across the app, while `false` hides them.

+     *  TOR Note: This is "Mozilla VPN" and should always be disabled for the tor browser

      */

-    var isIPProtectionEnabled by booleanPreference(

-        key = appContext.getPreferenceKey(R.string.pref_key_enable_ip_protection),

-        default = false,

-    )

+    var isIPProtectionEnabled = false

     /**

      * Indicates if the user has already toggled the VPN on.

+     * TOR Note: This is "Mozilla VPN" and should always be disabled for the tor browser

      */

-    var hasAlreadyUsedVpn by booleanPreference(

-        key = appContext.getPreferenceKey(R.string.pref_key_has_used_ip_protection),

-        default = false,

-    )

+    var hasAlreadyUsedVpn = false

     /**

      * Indicates if the IPProtection onboarding bottom sheet has been already shown to the user.

      * `true` makes the IPProtection bottom sheet appear, while `false` ensures the user does not see

      * the bottom sheet again. This is only shown to the user once and

      * if they dismiss it in anyway (e.g. tap on "Not now" or "Get started") then they will never see it again.

+     * TOR Note: This is "Mozilla VPN" and should always be disabled for the tor browser

      */

-    var hasShownIPProtectionPrompt by booleanPreference(

-        key = appContext.getPreferenceKey(R.string.pref_key_has_shown_ip_protection_prompt),

-        default = false,

-    )

+    var hasShownIPProtectionPrompt = false

     /**

      * Indicates if the IPProtection feature is available for the user.

      *

      * The flag is backed by a Nimbus `ip-protection` feature, with an option to override it through secret settings.

+     * TOR Note: This is "Mozilla VPN" and should always be disabled for the tor browser

      */

-    val isIPProtectionAvailable: Boolean

-        get() = FxNimbus.features.ipProtection.value().enabled || isIPProtectionEnabled

+    val isIPProtectionAvailable: Boolean = false

     /**

      * Tracks how many times the summarize menu item has been shown.

             app:isPreferenceVisible="false"

             android:title="@string/preferences_private_browsing_options" />

-        <org.mozilla.fenix.settings.IPProtectionPreference

-            android:key="@string/pref_key_ip_protection_settings"

-            app:iconSpaceReserved="false"

-            app:isPreferenceVisible="false"

-            app:allowDividerAbove="false"/>

-

         <androidx.preference.Preference

             android:key="@string/pref_key_https_only_settings"

             app:iconSpaceReserved="false"

       android:key="@string/pref_key_enable_longfox"

       android:title="@string/preferences_debug_settings_enable_longfox"

       app:iconSpaceReserved="false" />

-    <SwitchPreferenceCompat

-      android:key="@string/pref_key_enable_ip_protection"

-      android:title="@string/preferences_debug_settings_ip_protection"

-      app:iconSpaceReserved="false" />

     <SwitchPreferenceCompat

       android:defaultValue="false"

       android:key="@string/pref_key_enable_import_passwords"

Dan Ballard pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser

Commits:

8 changed files:

Changes: