October 2020 - tor-commits - lists.torproject.org

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 01 Oct '20

01 Oct '20

commit 152a8ed034b9e94ee4c9bfbe74651509fdeb59d9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 1 17:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+ka.po b/contents+ka.po index 9007e23bb8..d169cbaa00 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -8894,6 +8894,8 @@ msgid "" "To the extent you do maintain logs, however, you should not disclose them to" " any third party without first consulting a lawyer." msgstr "" +"გარდა ამისა, თუ აწარმოებთ გარკვეული სახის აღრიცხვებს, არ უნდა გაანდოთ გარეშე" +" პირებს, სანამ სამართალმცოდნეს არ გაესაუბრებით." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) @@ -8902,6 +8904,10 @@ msgid "" "Communications Privacy Act, and relay operators outside of the United States" " may be subject to similar data protection laws." msgstr "" +"შეერთებულ შტატებში, ამგვარი ინფორმაციის გამჟღავნება არღვევს ელექტრონული " +"კომუნიკაციების პირადი მონაცემების დაცვის აქტს, ხოლო შტატების გარეთ " +"გადამცემების გამშვებებს, სავარაუდოდ პასუხისმგებლობა დაეკისრებათ მონაცემთა " +"დაცვის მსგავსი საკანონმდებლო ნორმებით." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body)

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 01 Oct '20

01 Oct '20

commit 2f500cf0656567eb51a525cfa3db4e3052e4a843 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 1 16:45:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- is/aboutTor.dtd | 4 ++-- ka/aboutTor.dtd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index 9ffa145ef7..0ee39b01fb 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "">  -<!ENTITY aboutTor.ey2020.useamask ""> -<!ENTITY aboutTor.ey2020.resistsurveillance ""> +<!ENTITY aboutTor.ey2020.useamask "Fáðu þér grímu - notaðu Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Verðu þig fyrir eftirlitsfaraldrinum."> diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd index 9ffa145ef7..7278c63cce 100644 --- a/ka/aboutTor.dtd +++ b/ka/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "">  -<!ENTITY aboutTor.ey2020.useamask ""> -<!ENTITY aboutTor.ey2020.resistsurveillance ""> +<!ENTITY aboutTor.ey2020.useamask "გაიკეთეთ ნიღაბი, გამოიყენეთ Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "დაიცავით თავი, მეთვალყურეობის პანდემიისგან.">

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40061: Do not show "Send to device" in sharing menu
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: ab9ca18c by Alex Catarineu at 2020-10-01T17:55:47+02:00 Bug 40061: Do not show "Send to device" in sharing menu - - - - - f22fa2b5 by Matthew Finkel at 2020-10-01T16:24:50+00:00 Merge remote-tracking branch 'acatgl/40061' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt ===================================== @@ -35,7 +35,6 @@ class ShareFragment : AppCompatDialogFragment() { } private lateinit var shareInteractor: ShareInteractor private lateinit var shareCloseView: ShareCloseView - private lateinit var shareToAccountDevicesView: ShareToAccountDevicesView private lateinit var shareToAppsView: ShareToAppsView override fun onAttach(context: Context) { @@ -90,9 +89,6 @@ class ShareFragment : AppCompatDialogFragment() { ) view.shareWrapper.setOnClickListener { shareInteractor.onShareClosed() } - shareToAccountDevicesView = - ShareToAccountDevicesView(view.devicesShareLayout, shareInteractor) - if (args.showPage) { // Show the previous fragment underneath the share background scrim // by making it translucent. @@ -111,9 +107,6 @@ class ShareFragment : AppCompatDialogFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - viewModel.devicesList.observe(viewLifecycleOwner) { devicesShareOptions -> - shareToAccountDevicesView.setShareTargets(devicesShareOptions) - } viewModel.appsList.observe(viewLifecycleOwner) { appsToShareTo -> shareToAppsView.setShareTargets(appsToShareTo) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/1087d1efd878… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/1087d1efd878… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 01 Oct '20

01 Oct '20

commit eab4d613a66dcb2b6eb73113a9e92565de57178b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 1 16:19:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- pt-BR/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt-BR/browserOnboarding.properties b/pt-BR/browserOnboarding.properties index 6f7c8cab52..baa2ba7174 100644 --- a/pt-BR/browserOnboarding.properties +++ b/pt-BR/browserOnboarding.properties @@ -21,7 +21,7 @@ onboarding.tour-tor-network.button=Vá para a Exibição de Circuitos onboarding.tour-tor-circuit-display=Exibição de Circuitos onboarding.tour-tor-circuit-display.title=Veja o seu caminho. -onboarding.tour-tor-circuit-display.description=A cada domínio que você visita, o seu tráfego de internet é retransmitido e criptografado através de três retransmissores Tor em diversas partes do mundo. Nenhum website saberá a partir de onde você se conectou a ele. Você pode solicitar um novo circuito a qualquer momento clicando em "Novo Circuito para este Site" em nossa Exibição de Circuitos. +onboarding.tour-tor-circuit-display.description=Para cada domínio que você visita, o seu tráfego é retransmitido e criptografado em um circuito através de três retransmissores do Tor ao redor do mundo. Nenhum site sabe de onde você está se conectando. Você pode solicitar um novo circuito clicando em "Novo Circuito para este Site" no hamburger display à direita do seu browser. onboarding.tour-tor-circuit-display.button=Ver Meu Caminho onboarding.tour-tor-circuit-display.next-button=Vá para segurança

1 0

[translation/fenix-torbrowserstringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
by translation＠torproject.org 01 Oct '20

01 Oct '20

commit 17b8f5fbc9b18beaf49329041872129795dc6240 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 1 16:15:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- fr/torbrowser_strings.xml | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/fr/torbrowser_strings.xml b/fr/torbrowser_strings.xml new file mode 100644 index 0000000000..f5ace8233e --- /dev/null +++ b/fr/torbrowser_strings.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<resources> +  + <string name="preferences_disable_normal_mode">N’autoriser que le mode de navigation privée</string> +  + <string name="preferences_donate">Faire un don au Projet Tor.</string> +  + <string name="preferences_allow_screenshots">Autoriser les captures d’écran</string> + + <string name="tor_bootstrap_connect">Se connecter</string> + <string name="tor_bootstrap_connecting">Connexion</string> + <string name="tor_bootstrap_connecting_failed">Échec de connexion</string> + <string name="tor_bootstrap_quick_start_label">Démarrage rapide</string> + <string name="tor_bootstrap_quick_start_disabled">Activer le démarrage rapide afin de vous connecter automatiquement à l’avenir</string> + <string name="tor_bootstrap_quick_start_enabled">%s se connectera automatiquement au réseau Tor à l’avenir</string> + <string name="tor_bootstrap_swipe_for_logs">Faire glisser vers la gauche pour voir les journaux Tor. </string> + <string name="tor_initializing_log">Initialisation du journal de Tor</string> + + <string name="tor_onboarding_security_level">Définir votre niveau de sécurité</string> + <string name="tor_onboarding_security_level_description">Désactiver certaines fonctions Web qui peuvent être utilisées pour vous attaquer et nuire à votre sécurité, à votre anonymat et à la protection de vos données personnelles.</string> + <string name="tor_onboarding_security_level_standard_option">Normal</string> + <string name="tor_onboarding_security_level_standard_button_description">Toutes les fonctions du Navigateur Tor et des sites Web sont activées.</string> + <string name="tor_onboarding_security_level_safer_option">Plus sûr</string> + <string name="tor_onboarding_security_level_safer_button_description">Désactiver les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites.</string> + <string name="tor_onboarding_security_level_safest_option">Le plus sûr</string> + <string name="tor_onboarding_security_level_safest_button_description">Ne permettre que les fonctions de sites Web exigées pour les sites statiques et les services de base. Ces changements affectent les images, les contenus multimédias et les scripts.</string> + <string name="tor_onboarding_security_settings_button">Ouvrir les paramètres de sécurité</string> + <string name="tor_onboarding_donate_header">Faites un don et assurez la sécurité de Tor</string> + <string name="tor_onboarding_donate_description">Tor peut être utilisé gratuitement grâce aux dons de personnes telles que vous.</string> + <string name="tor_onboarding_donate_button">Faire un don maintenant</string> + + <string name="tor_explore_privately">Explorez, en toute confidentialité.</string> + + <string name="preferences_tor_network_settings">Réseau Tor</string> + <string name="preferences_tor_network_settings_explanation">Le Navigateur Tor achemine votre trafic par le réseau Tor, exploité par des milliers de bénévoles partout dans le monde.</string> + <string name="preferences_tor_network_settings_bridge_config">Configurer un pont</string> + <string name="preferences_tor_network_settings_bridge_config_description">Utilisez un pont pour vous connecter à Tor</string> + <string name="preferences_tor_network_settings_bridge_config_description_builtin_transport_enabled">Vous utilisez un pont intégré pour vous connecter à Tor</string> + <string name="preferences_tor_network_settings_bridge_config_description_user_provided_enabled">Vous avez indiqué un pont pour vous connecter à Tor</string> + <string name="preferences_tor_network_settings_bridge_config_explanation">Les ponts sont des relais non référencés qui rendent les connexions au réseau Tor plus difficiles à bloquer. En raison de la manière dont certains pays tentent de bloquer Tor, certains ponts fonctionnent dans certains pays, mais pas dans d’autres.</string> + <string name="preferences_tor_network_settings_bridge_config_toggle">Utiliser un pont</string> + <string name="preferences_tor_network_settings_bridge_config_toggle_description">Configurez un pont pour vous connecter à Tor</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure">meek-azure</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake">snowflake</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">Indiquer un pont que je connais</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Saisir des renseignements de pont provenant d’une source fiable</string> + <string name="preferences_tor_network_settings_bridge_config_current_bridge">Pont configuré actuellement : %s</string> + <string name="tor_network_settings_bridge_not_configured">Non configuré</string> + <string name="preferences_tor_network_settings_status">État actuel</string> + <string name="preferences_tor_network_settings_tor_ready">Tor est-il prêt : %s</string> + <string name="preferences_tor_network_settings_state">État : %s</string> + <string name="preferences_tor_network_settings_yes">Oui</string> + <string name="preferences_tor_network_settings_no">Non</string> + <string name="preferences_tor_network_settings_disconnected">Déconnecté</string> + <string name="preferences_tor_network_settings_connecting">Connexion</string> + <string name="preferences_tor_network_settings_connected">Connecté</string> + <string name="preferences_tor_network_settings_restarting">Redémarrage</string> + <string name="preferences_tor_network_settings_bridges_enabled">Les ponts sont activés : %s</string> +</resources>

1 0

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 01 Oct '20

01 Oct '20

commit 4927f3512bd13023ca8221056853be8faf7a425e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 1 16:15:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- fr/torbrowser_strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr/torbrowser_strings.xml b/fr/torbrowser_strings.xml index 5e856bcc7f..f5ace8233e 100644 --- a/fr/torbrowser_strings.xml +++ b/fr/torbrowser_strings.xml @@ -39,24 +39,24 @@ <string name="preferences_tor_network_settings_bridge_config_description">Utilisez un pont pour vous connecter à Tor</string> <string name="preferences_tor_network_settings_bridge_config_description_builtin_transport_enabled">Vous utilisez un pont intégré pour vous connecter à Tor</string> <string name="preferences_tor_network_settings_bridge_config_description_user_provided_enabled">Vous avez indiqué un pont pour vous connecter à Tor</string> - <string name="preferences_tor_network_settings_bridge_config_explanation">Les ponts sont des relais non listés qui rendent plus difficile le blocage des connexions au réseau Tor. En raison de la façon dont certains pays tentent de bloquer Tor, certains ponts fonctionnent dans certains pays mais pas dans d\'autres.</string> + <string name="preferences_tor_network_settings_bridge_config_explanation">Les ponts sont des relais non référencés qui rendent les connexions au réseau Tor plus difficiles à bloquer. En raison de la manière dont certains pays tentent de bloquer Tor, certains ponts fonctionnent dans certains pays, mais pas dans d’autres.</string> <string name="preferences_tor_network_settings_bridge_config_toggle">Utiliser un pont</string> <string name="preferences_tor_network_settings_bridge_config_toggle_description">Configurez un pont pour vous connecter à Tor</string> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure">meek-azure</string> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake">snowflake</string> <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">Indiquer un pont que je connais</string> - <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Saisir des informations de pont provenant d\'une source fiable</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Saisir des renseignements de pont provenant d’une source fiable</string> <string name="preferences_tor_network_settings_bridge_config_current_bridge">Pont configuré actuellement : %s</string> - <string name="tor_network_settings_bridge_not_configured">Pas configuré</string> + <string name="tor_network_settings_bridge_not_configured">Non configuré</string> <string name="preferences_tor_network_settings_status">État actuel</string> - <string name="preferences_tor_network_settings_tor_ready">Tor est-il prêt: %s</string> - <string name="preferences_tor_network_settings_state">État: %s</string> + <string name="preferences_tor_network_settings_tor_ready">Tor est-il prêt : %s</string> + <string name="preferences_tor_network_settings_state">État : %s</string> <string name="preferences_tor_network_settings_yes">Oui</string> <string name="preferences_tor_network_settings_no">Non</string> <string name="preferences_tor_network_settings_disconnected">Déconnecté</string> <string name="preferences_tor_network_settings_connecting">Connexion</string> <string name="preferences_tor_network_settings_connected">Connecté</string> <string name="preferences_tor_network_settings_restarting">Redémarrage</string> - <string name="preferences_tor_network_settings_bridges_enabled">Les ponts sont activés: %s</string> + <string name="preferences_tor_network_settings_bridges_enabled">Les ponts sont activés : %s</string> </resources>

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40064: Use Gecko Beta for Nightly and Debug variants
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: b4d5b61e by Matthew Finkel at 2020-09-30T22:12:23+00:00 Bug 40064: Use Gecko Beta for Nightly and Debug variants - - - - - 1087d1ef by Matthew Finkel at 2020-10-01T15:48:58+00:00 Merge branch 'bug_40064_00' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - app/build.gradle Changes: ===================================== app/build.gradle ===================================== @@ -327,9 +327,9 @@ ext.gleanDocsDirectory = "$rootDir/docs" apply plugin: "org.mozilla.telemetry.glean-gradle-plugin" dependencies { - debugImplementation Deps.mozilla_browser_engine_gecko_nightly + debugImplementation Deps.mozilla_browser_engine_gecko_beta - nightlyImplementation Deps.mozilla_browser_engine_gecko_nightly + nightlyImplementation Deps.mozilla_browser_engine_gecko_beta betaImplementation Deps.mozilla_browser_engine_gecko_beta releaseImplementation Deps.mozilla_browser_engine_gecko_release View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/d7f419b356f4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/d7f419b356f4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 5 commits: fixup! Bug 40028: Implement Tor Onboarding
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: dbb92015 by Matthew Finkel at 2020-09-30T18:34:52+00:00 fixup! Bug 40028: Implement Tor Onboarding - - - - - dcb56537 by Matthew Finkel at 2020-09-30T21:15:09+00:00 Bug 40026: Implement Security Level settings - - - - - 0f1c4980 by Matthew Finkel at 2020-09-30T21:15:09+00:00 Bug 40026: Integrate Security Level settings - - - - - d54480c4 by Matthew Finkel at 2020-10-01T15:45:22+00:00 fixup! Bug 34378: Port external helper app prompting - - - - - d7f419b3 by Matthew Finkel at 2020-10-01T15:47:50+00:00 Merge branch 'bug_40026_06' into tor-browser-81.1.1-10.0-1 - - - - - 12 changed files: - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt - + app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt - app/src/main/res/layout/tor_onboarding_security_level.xml - app/src/main/res/navigation/nav_graph.xml - app/src/main/res/values/preference_keys.xml - app/src/main/res/values/torbrowser_strings.xml - app/src/main/res/xml/preferences.xml - + app/src/main/res/xml/tor_security_level_preferences.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -416,6 +416,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { if (startIntent.creatorPackage == applicationContext.packageName) { val dialog = getOrCreateDialog() dialog.onConfirmRedirect = { + @Suppress("EmptyCatchBlock") try { startIntent.send() } catch (error: PendingIntent.CanceledException) { ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt ===================================== @@ -367,6 +367,8 @@ class DefaultSessionControlController( } override fun handleOpenSecurityLevelSettingsClicked() { + val directions = HomeFragmentDirections.actionGlobalTorSecurityLevelFragment() + navController.nav(R.id.homeFragment, directions) } override fun handleWhatsNewGetAnswersClicked() { ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt ===================================== @@ -8,8 +8,11 @@ import android.view.View import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.tor_onboarding_security_level.view.* import org.mozilla.fenix.R +import org.mozilla.fenix.ext.components import org.mozilla.fenix.home.sessioncontrol.OnboardingInteractor import org.mozilla.fenix.onboarding.OnboardingRadioButton +import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.tor.SecurityLevelUtil import org.mozilla.fenix.utils.view.addToRadioGroup class TorOnboardingSecurityLevelViewHolder( @@ -24,7 +27,7 @@ class TorOnboardingSecurityLevelViewHolder( init { view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_tracking_protection) - standardSecurityLevel = view.security_level_standard_default + standardSecurityLevel = view.security_level_standard_option saferSecurityLevel = view.security_level_safer_option safestSecurityLevel = view.security_level_safest_option @@ -33,34 +36,45 @@ class TorOnboardingSecurityLevelViewHolder( ) view.open_settings_button.setOnClickListener { - interactor.onOpenSettingsClicked() + interactor.onOpenSecurityLevelSettingsClicked() } - setupRadioGroup() + setupRadioGroup(view) } - private fun setupRadioGroup() { + private fun setupRadioGroup(view: View) { addToRadioGroup(standardSecurityLevel, saferSecurityLevel, safestSecurityLevel) - standardSecurityLevel.isChecked = true - safestSecurityLevel.isChecked = false - saferSecurityLevel.isChecked = false + val securityLevel = try { + SecurityLevelUtil.getSecurityLevelFromInt( + view.context.components.core.engine.settings.torSecurityLevel + ) + } catch (e: IllegalStateException) { + SecurityLevel.STANDARD + } + + standardSecurityLevel.isChecked = securityLevel == SecurityLevel.STANDARD + safestSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFEST + saferSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFER standardSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.STANDARD) } saferSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.SAFER) } safestSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.SAFEST) } } - private fun updateSecurityLevel() { + private fun updateSecurityLevel(newLevel: SecurityLevel) { + itemView.context.components.let { + it.core.engine.settings.torSecurityLevel = newLevel.intRepresentation + } } companion object { ===================================== app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -217,6 +217,9 @@ class SettingsFragment : PreferenceFragmentCompat() { resources.getString(R.string.pref_key_tor_network_settings) -> { SettingsFragmentDirections.actionSettingsFragmentToTorNetworkSettingsFragment() } + resources.getString(R.string.pref_key_tor_security_level_settings) -> { + SettingsFragmentDirections.actionSettingsFragmentToTorSecurityLevelFragment() + } resources.getString(R.string.pref_key_tracking_protection_settings) -> { requireContext().metrics.track(Event.TrackingProtectionSettings) SettingsFragmentDirections.actionSettingsFragmentToTrackingProtectionFragment() ===================================== app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt ===================================== @@ -0,0 +1,86 @@ +/* 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 onResume() { + super.onResume() + showToolbar(getString(R.string.preferences_tor_security_level_options)) + } + + 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 + } +} ===================================== app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt ===================================== @@ -0,0 +1,51 @@ +/* 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.tor + +import android.os.Parcelable +import androidx.annotation.StringRes +import kotlinx.android.parcel.Parcelize +import org.mozilla.fenix.R + +@Parcelize +enum class SecurityLevel( + @StringRes val preferenceKey: Int, + @StringRes val contentDescriptionRes: Int, + val intRepresentation: Int +) : Parcelable { + + STANDARD( + preferenceKey = R.string.pref_key_tor_security_level_standard_option, + contentDescriptionRes = R.string.tor_security_level_standard_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_STANDARD + ), + SAFER( + preferenceKey = R.string.pref_key_tor_security_level_safer_option, + contentDescriptionRes = R.string.tor_security_level_safer_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_SAFER + ), + SAFEST( + preferenceKey = R.string.pref_key_tor_security_level_safest_option, + contentDescriptionRes = R.string.tor_security_level_safest_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_SAFEST + ); + + companion object { + const val SECURITY_LEVEL_STANDARD = 4 + const val SECURITY_LEVEL_SAFER = 2 + const val SECURITY_LEVEL_SAFEST = 1 + } +} + +object SecurityLevelUtil { + fun getSecurityLevelFromInt(level: Int): SecurityLevel { + return when (level) { + SecurityLevel.SECURITY_LEVEL_STANDARD -> SecurityLevel.STANDARD + SecurityLevel.SECURITY_LEVEL_SAFER -> SecurityLevel.SAFER + SecurityLevel.SECURITY_LEVEL_SAFEST -> SecurityLevel.SAFEST + else -> throw IllegalStateException("Security Level $level is not valid") + } + } +} ===================================== app/src/main/res/layout/tor_onboarding_security_level.xml ===================================== @@ -37,7 +37,7 @@ <org.mozilla.fenix.onboarding.OnboardingRadioButton - android:id="@+id/security_level_standard_default" + android:id="@+id/security_level_standard_option" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -52,9 +52,9 @@ android:theme="@style/Checkable.Colored" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/description_text" - app:onboardingKey="@string/pref_key_tor_security_level_standard_default" - app:onboardingKeyDescription="@string/tor_onboarding_security_level_standard_button_description" - app:onboardingKeyTitle="@string/tor_onboarding_security_level_standard_option" + app:onboardingKey="@string/pref_key_tor_security_level_standard_option" + app:onboardingKeyDescription="@string/tor_security_level_standard_description" + app:onboardingKeyTitle="@string/tor_security_level_standard_option" tools:text="Standard" /> <org.mozilla.fenix.onboarding.OnboardingRadioButton @@ -73,10 +73,10 @@ android:textColor="@color/primary_state_list_text_color" android:theme="@style/Checkable.Colored" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/security_level_standard_default" + app:layout_constraintTop_toBottomOf="@id/security_level_standard_option" app:onboardingKey="@string/pref_key_tor_security_level_safer_option" - app:onboardingKeyDescription="@string/tor_onboarding_security_level_safer_button_description" - app:onboardingKeyTitle="@string/tor_onboarding_security_level_safer_option" + app:onboardingKeyDescription="@string/tor_security_level_safer_description" + app:onboardingKeyTitle="@string/tor_security_level_safer_option" tools:text="Safer" /> <org.mozilla.fenix.onboarding.OnboardingRadioButton @@ -97,8 +97,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/security_level_safer_option" app:onboardingKey="@string/pref_key_tor_security_level_safest_option" - app:onboardingKeyDescription="@string/tor_onboarding_security_level_safest_button_description" - app:onboardingKeyTitle="@string/tor_onboarding_security_level_safest_option" + app:onboardingKeyDescription="@string/tor_security_level_safest_description" + app:onboardingKeyTitle="@string/tor_security_level_safest_option" tools:text="Safest" /> <Button ===================================== app/src/main/res/navigation/nav_graph.xml ===================================== @@ -58,6 +58,9 @@ <action android:id="@+id/action_global_syncedTabsFragment" app:destination="@id/syncedTabsFragment" /> + <action + android:id="@+id/action_global_torSecurityLevelFragment" + app:destination="@id/torSecurityLevelFragment" /> <action android:id="@+id/action_global_privateBrowsingFragment" app:destination="@id/privateBrowsingFragment" /> @@ -496,6 +499,13 @@ app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> + <action + android:id="@+id/action_settingsFragment_to_torSecurityLevelFragment" + app:destination="@id/torSecurityLevelFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> <action android:id="@+id/action_settingsFragment_to_privateBrowsingFragment" app:destination="@id/privateBrowsingFragment" @@ -655,6 +665,10 @@ android:id="@+id/customizationFragment" android:name="org.mozilla.fenix.settings.CustomizationFragment" android:label="@string/preferences_customize" /> + <fragment + android:id="@+id/torSecurityLevelFragment" + android:name="org.mozilla.fenix.settings.TorSecurityLevelFragment" + android:label="@string/preferences_tor_security_level_settings" /> <fragment android:id="@+id/privateBrowsingFragment" android:name="org.mozilla.fenix.settings.PrivateBrowsingFragment" ===================================== app/src/main/res/values/preference_keys.xml ===================================== @@ -223,10 +223,10 @@ <string name="pref_key_noscript_installed" translatable="false">pref_key_noscript_installed</string>  - <string name="pref_key_tor_security_level_standard_default" translatable="false">pref_key_tor_security_level_standard_default</string> + <string name="pref_key_tor_security_level_settings" translatable="false">pref_key_tor_security_level_settings</string> + <string name="pref_key_tor_security_level_standard_option" translatable="false">pref_key_tor_security_level_standard_option</string> <string name="pref_key_tor_security_level_safer_option" translatable="false">pref_key_tor_security_level_safer_option</string> <string name="pref_key_tor_security_level_safest_option" translatable="false">pref_key_tor_security_level_safest_option</string> - <string name="pref_key_tor_security_level_custom_option" translatable="false">pref_key_tor_security_level_custom_option</string> <string name="pref_key_tor_network_settings" translatable="false">pref_key_tor_network_settings</string> <string name="pref_key_tor_network_settings_explanation" translatable="false">pref_key_tor_network_settings_explanation</string> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -20,12 +20,6 @@ <string name="tor_onboarding_security_level">Set your Security Level</string> <string name="tor_onboarding_security_level_description">Disable certain web features that can be used to attack you, and harm your security, anonymity, and privacy.</string> - <string name="tor_onboarding_security_level_standard_option">Standard</string> - <string name="tor_onboarding_security_level_standard_button_description">All Tor Browser and website features are enabled.</string> - <string name="tor_onboarding_security_level_safer_option">Safer</string> - <string name="tor_onboarding_security_level_safer_button_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string> - <string name="tor_onboarding_security_level_safest_option">Safest</string> - <string name="tor_onboarding_security_level_safest_button_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</string> <string name="tor_onboarding_security_settings_button">Open Security Settings</string> <string name="tor_onboarding_donate_header">Donate and keep Tor safe</string> <string name="tor_onboarding_donate_description">Tor is free to use because of donations from people like you.</string> @@ -59,4 +53,17 @@ <string name="preferences_tor_network_settings_connected">Connected</string> <string name="preferences_tor_network_settings_restarting">Restarting</string> <string name="preferences_tor_network_settings_bridges_enabled">Bridges are enabled: %s</string> + +  + <string name="preferences_tor_security_level_settings">Security Settings</string> + <string name="preferences_tor_security_level_options">Security Level</string> + +  + <string name="tor_security_level_standard_option">Standard</string> + <string name="tor_security_level_standard_description">All Tor Browser and website features are enabled.</string> + <string name="tor_security_level_safer_option">Safer</string> + <string name="tor_security_level_safer_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string> + <string name="tor_security_level_safest_option">Safest</string> + <string name="tor_security_level_safest_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</string> + </resources> ===================================== app/src/main/res/xml/preferences.xml ===================================== @@ -90,6 +90,11 @@ app:iconSpaceReserved="false" android:layout="@layout/preference_category_main_style"> + <androidx.preference.Preference + android:icon="@drawable/ic_tracking_protection_enabled" + android:key="@string/pref_key_tor_security_level_settings" + android:title="@string/preferences_tor_security_level_settings"/> + <androidx.preference.Preference android:icon="@drawable/ic_private_browsing" android:key="@string/pref_key_private_browsing" ===================================== app/src/main/res/xml/tor_security_level_preferences.xml ===================================== @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="true" + android:key="@string/pref_key_tor_security_level_standard_option" + android:summary="@string/tor_security_level_standard_description" + android:title="@string/tor_security_level_standard_option" /> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="false" + android:key="@string/pref_key_tor_security_level_safer_option" + android:summary="@string/tor_security_level_safer_description" + android:title="@string/tor_security_level_safer_option" /> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="false" + android:key="@string/pref_key_tor_security_level_safest_option" + android:summary="@string/tor_security_level_safest_description" + android:title="@string/tor_security_level_safest_option" /> +</androidx.preference.PreferenceScreen> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/74d5540329f4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/74d5540329f4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/89' into master
by gk＠torproject.org 01 Oct '20

01 Oct '20

commit 0f4e3794bed9b82b579710f9229c43614623d08e Merge: 56caff8 220b2bc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 1 15:19:06 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/89' into master projects/fenix/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 40113: Build Fenix Nightly variant for nightly target
by gk＠torproject.org 01 Oct '20

01 Oct '20

commit 220b2bc905c5c8e054f367cf003cbd5fb70215c5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 30 22:14:03 2020 +0000 Bug 40113: Build Fenix Nightly variant for nightly target --- projects/fenix/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fenix/config b/projects/fenix/config index 1798e0d..a3d0b73 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -22,7 +22,7 @@ targets: nightly: git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 - variant: Beta + variant: Nightly input_files: - project: container-image

1 0