fixup! [android] Disable features and functionality (8d9130e9) · Commits · The Tor Project / Applications / Tor Browser

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -596,7 +596,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, Crash
		summarizeToolbarHighlightBinding,
		components.core.summarizationSettings,
		translationsAIControllableFeatureRegistrar,
		ipProtectionPrompter,
		)

		addAboutHomeBinding(lifecycle)

+2 −2

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ fun MainMenu(
		)
		}

		if (showIPProtection) {
		if (false) {
		MenuGroup {
		IPProtectionMenuItem(
		state = ipProtectionMenuState,
		@@ -753,7 +753,7 @@ private fun MenuDialogPreview(
		showBanner = true,
		isDownloadHighlighted = true,
		webExtensionMenuCount = 1,
		showIPProtection = true,
		showIPProtection = false,
		ipProtectionMenuState = IPProtectionMenuState(),
		onMoreMenuClick = {},
		onCustomizeReaderViewMenuClick = {},

+0 −1

Original line number	Diff line number	Diff line
		@@ -532,7 +532,6 @@ class HomeFragment : Fragment() {
		initReviewPromptBinding(view = view)
		initTabsCleanupFeature(view = view)
		initSnackbarBinding(view = view)
		initIpProtectionBindings(view = view)

		privacyNoticeBannerStore = PrivacyNoticeBannerStore(
		initialState = PrivacyNoticeBannerState(

+0 −6

Original line number	Diff line number	Diff line
		@@ -342,12 +342,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFra
		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

+0 −8

Original line number	Diff line number	Diff line
		@@ -428,13 +428,6 @@ class SettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment
		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()
		@@ -629,7 +622,6 @@ class SettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment
		)
		setupGeckoLogsPreference(settings)
		setupHttpsOnlyPreferences(settings)
		setupIPProtectionPreferences(components.ipProtection.store)
		setupNotificationPreference(
		NotificationManagerCompat.from(requireContext()).areNotificationsEnabled(),
		)