fixup! TB 40026 [android]: Implement Security Level settings on Android. (77d93411) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -1335,9 +1335,7 @@ class GeckoEngine(
		override var torSecurityLevel: Int
		get() = runtime.settings.torSecurityLevel
		set(value) {
		value.let {
		runtime.settings.torSecurityLevel = it
		}
		runtime.settings.torSecurityLevel = value
		}

		override var spoofEnglish: Boolean

mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt

+6 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,12 @@ abstract class Settings {

		/**
		* Setting to control the current security level
		*
		* 4 -> STANDARD
		*
		* 2 -> SAFER
		*
		* 1 -> SAFEST
		*/
		open var torSecurityLevel: Int by UnsupportedSetting()

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ class Core(
		cookieBannerHandlingGlobalRules = context.settings().shouldEnableCookieBannerGlobalRules,
		cookieBannerHandlingGlobalRulesSubFrames = context.settings().shouldEnableCookieBannerGlobalRulesSubFrame,
		emailTrackerBlockingPrivateBrowsing = false,
		torSecurityLevel = context.settings().torSecurityLevel().intRepresentation,
		torSecurityLevel = context.settings().torSecurityLevel,
		spoofEnglish = context.settings().spoofEnglish,
		)

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ import android.os.Build
		import android.os.Bundle
		import android.os.Handler
		import android.os.Looper
		import android.util.Log
		import android.view.LayoutInflater
		import android.view.WindowManager
		import android.widget.Toast
		@@ -67,7 +68,7 @@ import org.mozilla.fenix.ext.showToolbar
		import org.mozilla.fenix.nimbus.FxNimbus
		import org.mozilla.fenix.perf.ProfilerViewModel
		import org.mozilla.fenix.settings.account.AccountUiView
		import org.mozilla.fenix.tor.SecurityLevel
		import org.mozilla.fenix.tor.TorSecurityLevel
		import org.mozilla.fenix.tor.QuickstartViewModel
		import org.mozilla.fenix.utils.Settings
		import kotlin.system.exitProcess
		@@ -353,7 +354,7 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler {
		SettingsFragmentDirections.actionSettingsFragmentToPrivateBrowsingFragment()
		}

		resources.getString(R.string.pref_key_tor_security_level_settings) -> {
		resources.getString(R.string.pref_key_tor_security_level) -> {
		SettingsFragmentDirections.actionSettingsFragmentToTorSecurityLevelFragment()
		}

		@@ -852,13 +853,13 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler {
		@VisibleForTesting
		internal fun setupSecurityLevelPreference() {
		val securityLevelPreference =
		requirePreference<Preference>(R.string.pref_key_tor_security_level_settings)
		securityLevelPreference.summary = context?.settings()?.torSecurityLevel()?.let {
		when (it) {
		SecurityLevel.STANDARD -> getString(R.string.tor_security_level_standard_option)
		SecurityLevel.SAFER -> getString(R.string.tor_security_level_safer_option)
		SecurityLevel.SAFEST -> getString(R.string.tor_security_level_safest_option)
		}
		requirePreference<Preference>(R.string.pref_key_tor_security_level)
		securityLevelPreference.summary =
		when (requireContext().settings().torSecurityLevel) {
		TorSecurityLevel.STANDARD.level -> getString(R.string.tor_security_level_standard)
		TorSecurityLevel.SAFER.level -> getString(R.string.tor_security_level_safer)
		TorSecurityLevel.SAFEST.level -> getString(R.string.tor_security_level_safest)
		else -> throw Exception("Unexpected TorSecurityLevel of ${requireContext().settings().torSecurityLevel}")
		}
		}

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

deleted100644 → 0

+0 −81

Original line number	Diff line number	Diff line
		/* This Source Code Form is subject to the terms of the Mozilla Public
		* License, v. 2.0. If a copy of the MPL was not distributed with this
		* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

		package org.mozilla.fenix.settings

		import android.os.Bundle
		import androidx.preference.PreferenceFragmentCompat
		import org.mozilla.fenix.R
		import org.mozilla.fenix.ext.components
		import org.mozilla.fenix.ext.settings
		import org.mozilla.fenix.ext.showToolbar
		import org.mozilla.fenix.tor.SecurityLevel
		import org.mozilla.fenix.tor.SecurityLevelUtil
		import org.mozilla.fenix.utils.view.GroupableRadioButton
		import org.mozilla.fenix.utils.view.addToRadioGroup
		import org.mozilla.fenix.utils.view.uncheckAll

		/**
		* Lets the user choose their security level
		*/
		@Suppress("SpreadOperator")
		class TorSecurityLevelFragment : PreferenceFragmentCompat() {
		private val securityLevelRadioGroups = mutableListOf<GroupableRadioButton>()
		private var previousSecurityLevel: SecurityLevel? = null

		override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
		setPreferencesFromResource(R.xml.tor_security_level_preferences, rootKey)

		val currentLevel: SecurityLevel? = context?.components?.let {
		try {
		SecurityLevelUtil.getSecurityLevelFromInt(
		it.core.engine.settings.torSecurityLevel
		)
		} catch (e: IllegalStateException) {
		// The default state is 0. If we get an invalid state then
		// default to Standard (4).
		SecurityLevel.STANDARD
		}
		}

		if (currentLevel == null) {
		throw IllegalStateException("context or Components is null.")
		}

		val radioSafer = bindSecurityLevelRadio(SecurityLevel.SAFER)
		val radioSafest = bindSecurityLevelRadio(SecurityLevel.SAFEST)
		val radioStandard = bindSecurityLevelRadio(SecurityLevel.STANDARD)

		securityLevelRadioGroups.addAll(mutableListOf(radioSafer, radioSafest, radioStandard))
		// `*` is Kotlin's "spread" operator, for expanding an Array as a vararg.
		addToRadioGroup(*securityLevelRadioGroups.toTypedArray())

		securityLevelRadioGroups.uncheckAll()
		val securityLevelRadioButton = requirePreference<RadioButtonPreference>(currentLevel.preferenceKey)
		// Cache this for later comparison in the OnPreferenceChangeListener
		previousSecurityLevel = currentLevel
		securityLevelRadioButton.setCheckedWithoutClickListener(true)
		}

		private fun bindSecurityLevelRadio(
		level: SecurityLevel
		): RadioButtonPreference {
		val radio = requirePreference<RadioButtonPreference>(level.preferenceKey)

		radio.summary = getString(level.contentDescriptionRes)

		radio.apply {
		setOnPreferenceChangeListener<Boolean> { preference, isChecked ->
		if (isChecked && (previousSecurityLevel!! != level)) {
		preference.context.components.core.engine.settings.torSecurityLevel =
		level.intRepresentation
		previousSecurityLevel = level
		}
		true
		}
		}

		return radio
		}
		}