[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-153.0esr-16.0-1] fixup! [android] Disable features and functionality

Title: GitLab

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

Commits:

  • 1a66a107
    by clairehurst at 2026-07-21T19:10:38-07:00 
    fixup! [android] Disable features and functionality

Bug 45118: Disable Mozilla VPN

8 changed files:

Changes:

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
    ... ... @@ -609,7 +609,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, Crash
    609 609 
                 summarizeToolbarHighlightBinding,
    610 610 
                 components.core.summarizationSettings,
    611 611 
                 translationsAIControllableFeatureRegistrar,
    612 
    -            ipProtectionPrompter,
    613 612 
             )
    614 613
    615 614 
             if (!isCustomTabIntent(intent)) {

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt
    ... ... @@ -253,7 +253,7 @@ fun MainMenu(
    253 253 
                 }
    254 254 
             }
    255 255
    256 
    -        if (showIPProtection) {
    256 
    +        if (false) {
    257 257 
                 MenuGroup {
    258 258 
                     IPProtectionMenuItem(
    259 259 
                         state = ipProtectionMenuState,
    ... ... @@ -712,7 +712,7 @@ private fun MenuDialogPreview(
    712 712 
                     showBanner = true,
    713 713 
                     isDownloadHighlighted = true,
    714 714 
                     webExtensionMenuCount = 1,
    715 
    -                showIPProtection = true,
    715 
    +                showIPProtection = false,
    716 716 
                     ipProtectionMenuState = IPProtectionMenuState(),
    717 717 
                     onMoreMenuClick = {},
    718 718 
                     onCustomizeReaderViewMenuClick = {},

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
    ... ... @@ -529,7 +529,6 @@ class HomeFragment : Fragment(), UserInteractionHandler {
    529 529 
             initReviewPromptBinding(view = view)
    530 530 
             initTabsCleanupFeature(view = view)
    531 531 
             initSnackbarBinding(view = view)
    532 
    -        initIpProtectionBindings(view = view)
    533 532
    534 533 
             privacyNoticeBannerStore = PrivacyNoticeBannerStore(
    535 534 
                 initialState = PrivacyNoticeBannerState(

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
    ... ... @@ -357,12 +357,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFra
    357 357 
                 onPreferenceChangeListener = SharedPreferenceUpdater()
    358 358 
             }
    359 359
    360 
    -        requirePreference<SwitchPreferenceCompat>(R.string.pref_key_enable_ip_protection).apply {
    361 
    -            isVisible = Config.channel.isNightlyOrDebug
    362 
    -            isChecked = settings.isIPProtectionEnabled
    363 
    -            onPreferenceChangeListener = SharedPreferenceUpdater()
    364 
    -        }
    365 
    -
    366 360 
             requirePreference<SwitchPreferenceCompat>(R.string.pref_key_enable_import_passwords).apply {
    367 361 
                 isVisible = Config.channel.isDebug
    368 362 
                 isChecked = settings.importPasswordsFeatureFlagEnabled

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
    ... ... @@ -454,13 +454,6 @@ class SettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment,
    454 454 
                     SettingsFragmentDirections.actionSettingsFragmentToHttpsOnlyFragment()
    455 455 
                 }
    456 456
    457 
    -            resources.getString(R.string.pref_key_ip_protection_settings) -> {
    458 
    -                Vpn.settingsPageTapped.record(Vpn.SettingsPageTappedExtra(entrypoint = "Settings"))
    459 
    -                SettingsFragmentDirections.actionSettingsFragmentToIpProtectionFragment(
    460 
    -                    entrypoint = FenixFxAEntryPoint.IPProtectionSettings,
    461 
    -                )
    462 
    -            }
    463 
    -
    464 457 
                 resources.getString(R.string.pref_key_tracking_protection_settings) -> {
    465 458 
                     TrackingProtection.etpSettings.record(NoExtras())
    466 459 
                     SettingsFragmentDirections.actionSettingsFragmentToTrackingProtectionFragment()
    ... ... @@ -675,7 +668,6 @@ class SettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment,
    675 668 
             setupGeckoLogsPreference(settings)
    676 669 
             setupSecurityLevelPreference()
    677 670 
             setupHttpsOnlyPreferences(settings)
    678 
    -        setupIPProtectionPreferences(components.ipProtection.store)
    679 671 
             setupNotificationPreference(
    680 672 
                 NotificationManagerCompat.from(requireContext()).areNotificationsEnabled(),
    681 673 
             )

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
    ... ... @@ -2803,19 +2803,15 @@ class Settings(
    2803 2803 
          * Persists IPProtection state set through Secret Settings.
    2804 2804 
          *
    2805 2805 
          * `true` makes the IPProtection UI elements visible across the app, while `false` hides them.
    2806 
    +     *  TOR Note: This is "Mozilla VPN" and should always be disabled for the tor browser
    2806 2807 
          */
    2807 
    -    var isIPProtectionEnabled by booleanPreference(
    2808 
    -        key = appContext.getPreferenceKey(R.string.pref_key_enable_ip_protection),
    2809 
    -        default = false,
    2810 
    -    )
    2808 
    +    var isIPProtectionEnabled = false
    2811 2809
    2812 2810 
         /**
    2813 2811 
          * Indicates if the user has already toggled the VPN on.
    2812 
    +     * TOR Note: This is "Mozilla VPN" and should always be disabled for the tor browser
    2814 2813 
          */
    2815 
    -    var hasAlreadyUsedVpn by booleanPreference(
    2816 
    -        key = appContext.getPreferenceKey(R.string.pref_key_has_used_ip_protection),
    2817 
    -        default = false,
    2818 
    -    )
    2814 
    +    var hasAlreadyUsedVpn = false
    2819 2815
    2820 2816 
         /**
    2821 2817 
          * Indicates if the IPProtection onboarding bottom sheet has been already shown to the user.
    ... ... @@ -2823,19 +2819,17 @@ class Settings(
    2823 2819 
          * `true` makes the IPProtection bottom sheet appear, while `false` ensures the user does not see
    2824 2820 
          * the bottom sheet again. This is only shown to the user once and
    2825 2821 
          * if they dismiss it in anyway (e.g. tap on "Not now" or "Get started") then they will never see it again.
    2822 
    +     * TOR Note: This is "Mozilla VPN" and should always be disabled for the tor browser
    2826 2823 
          */
    2827 
    -    var hasShownIPProtectionPrompt by booleanPreference(
    2828 
    -        key = appContext.getPreferenceKey(R.string.pref_key_has_shown_ip_protection_prompt),
    2829 
    -        default = false,
    2830 
    -    )
    2824 
    +    var hasShownIPProtectionPrompt = false
    2831 2825
    2832 2826 
         /**
    2833 2827 
          * Indicates if the IPProtection feature is available for the user.
    2834 2828 
          *
    2835 2829 
          * The flag is backed by a Nimbus `ip-protection` feature, with an option to override it through secret settings.
    2830 
    +     * TOR Note: This is "Mozilla VPN" and should always be disabled for the tor browser
    2836 2831 
          */
    2837 
    -    val isIPProtectionAvailable: Boolean
    2838 
    -        get() = FxNimbus.features.ipProtection.value().enabled || isIPProtectionEnabled
    2832 
    +    val isIPProtectionAvailable: Boolean = false
    2839 2833
    2840 2834 
         /**
    2841 2835 
          * Tracks how many times the summarize menu item has been shown.

  • mobile/android/fenix/app/src/main/res/xml/preferences.xml
    ... ... @@ -126,12 +126,6 @@
    126 126 
                 app:isPreferenceVisible="false"
    127 127 
                 android:title="@string/preferences_private_browsing_options" />
    128 128
    129 
    -        <org.mozilla.fenix.settings.IPProtectionPreference
    130 
    -            android:key="@string/pref_key_ip_protection_settings"
    131 
    -            app:iconSpaceReserved="false"
    132 
    -            app:isPreferenceVisible="false"
    133 
    -            app:allowDividerAbove="false"/>
    134 
    -
    135 129 
             <androidx.preference.Preference
    136 130 
                 android:key="@string/pref_key_https_only_settings"
    137 131 
                 app:iconSpaceReserved="false"

  • mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml
    ... ... @@ -230,10 +230,6 @@
    230 230 
           android:key="@string/pref_key_enable_longfox"
    231 231 
           android:title="@string/preferences_debug_settings_enable_longfox"
    232 232 
           app:iconSpaceReserved="false" />
    233 
    -    <SwitchPreferenceCompat
    234 
    -      android:key="@string/pref_key_enable_ip_protection"
    235 
    -      android:title="@string/preferences_debug_settings_ip_protection"
    236 
    -      app:iconSpaceReserved="false" />
    237 233 
         <SwitchPreferenceCompat
    238 234 
           android:defaultValue="false"
    239 235 
           android:key="@string/pref_key_enable_import_passwords"

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1a66a107285a0c3e4f9ee39750b60fb565bfbe49 at 1784686264 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx