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

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40011: Hide option for disallowing addons in private mode
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: f7f89b0b by Alex Catarineu at 2020-10-01T18:31:11+02:00 Bug 40011: Hide option for disallowing addons in private mode - - - - - 8de106ba by Matthew Finkel at 2020-10-01T18:01:21+00:00 Merge remote-tracking branch 'acatgl/40011' into android-components-57.0.6-10.0-2 - - - - - 2 changed files: - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - samples/browser/src/main/res/layout/activity_installed_add_on_details.xml Changes: ===================================== components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml ===================================== @@ -63,6 +63,7 @@ /> <androidx.appcompat.widget.AppCompatCheckBox + android:visibility="gone" android:id="@+id/allow_in_private_browsing" android:layout_width="wrap_content" android:layout_height="wrap_content" ===================================== samples/browser/src/main/res/layout/activity_installed_add_on_details.xml ===================================== @@ -70,6 +70,7 @@ app:drawableStartCompat="@drawable/mozac_ic_permissions" /> <Switch + android:visibility="gone" android:id="@+id/allow_in_private_browsing_switch" android:layout_width="match_parent" android:layout_height="wrap_content" View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… 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] 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

[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

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 40125: Expose Security Level pref in GeckoView
by sysrqb＠torproject.org 01 Oct '20

01 Oct '20

commit bacf200e1f5279121924b92a69fe5301e44572a6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 14 02:52:28 2020 +0000 Bug 40125: Expose Security Level pref in GeckoView --- mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index b6d974dda197..e5dec1ff09e9 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -577,6 +577,7 @@ package org.mozilla.geckoview { method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); + method public int getTorSecurityLevel(); method public boolean getUseMaxScreenDepth(); method @Deprecated public boolean getUseMultiprocess(); method public boolean getWebFontsEnabled(); @@ -595,6 +596,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean); method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int); method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean); + method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int); method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean); field public static final int COLOR_SCHEME_DARK = 1; @@ -630,6 +632,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); + method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); method @Deprecated @NonNull public GeckoRuntimeSettings.Builder useMultiprocess(boolean); method @NonNull public GeckoRuntimeSettings.Builder webFontsEnabled(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 59ee4e9ca66e..84b58f4ead40 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -457,6 +457,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { getSettings().mForceUserScalable.set(flag); return this; } + + /** + * Set security level. + * + * @param level A value determining the security level. Default is 0. + * @return This Builder instance. + */ + public @NonNull Builder torSecurityLevel(final int level) { + getSettings().mTorSecurityLevel.set(level); + return this; + } } private GeckoRuntime mRuntime; @@ -507,6 +518,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { "browser.tabs.remote.autostart", true); /* package */ final Pref<Boolean> mAutofillLogins = new Pref<Boolean>( "signon.autofillForms", true); + /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>( + "extensions.torbutton.security_slider", 0); /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM; @@ -1157,6 +1170,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; } + /** + * Gets the current security level. + * + * @return current security protection level + */ + public int getTorSecurityLevel() { + return mTorSecurityLevel.get(); + } + + /** + * Sets the Tor Security Level. + * + * @param level security protection level + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) { + mTorSecurityLevel.commit(level); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Merge branch 'bug_40125_01' into tor-browser-81.0b9-10.0-1
by sysrqb＠torproject.org 01 Oct '20

01 Oct '20

commit 572a39faa22c285a856bb3ed6fc2d630ce465254 Merge: 9e380b2e1818 bacf200e1f52 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 1 14:04:52 2020 +0000 Merge branch 'bug_40125_01' into tor-browser-81.0b9-10.0-1 mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+)

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40006: Expose Security Level interface
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: 25f1f7c1 by Matthew Finkel at 2020-09-30T21:52:48+00:00 Bug 40006: Expose Security Level interface - - - - - 6f338e43 by Matthew Finkel at 2020-10-01T14:02:33+00:00 Merge branch 'bug_40006_02' into android-components-57.0.6-10.0-2 - - - - - 3 changed files: - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt Changes: ===================================== components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt ===================================== @@ -615,6 +615,14 @@ class GeckoEngine( override var forceUserScalableContent: Boolean get() = runtime.settings.forceUserScalableEnabled set(value) { runtime.settings.forceUserScalableEnabled = value } + + override var torSecurityLevel: Int + get() = runtime.settings.torSecurityLevel + set(value) { + value.let { + runtime.settings.torSecurityLevel = it + } + } }.apply { defaultSettings?.let { this.javascriptEnabled = it.javascriptEnabled @@ -631,6 +639,7 @@ class GeckoEngine( this.fontSizeFactor = it.fontSizeFactor this.forceUserScalableContent = it.forceUserScalableContent this.loginAutofillEnabled = it.loginAutofillEnabled + this.torSecurityLevel = it.torSecurityLevel } } ===================================== components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt ===================================== @@ -615,6 +615,14 @@ class GeckoEngine( override var forceUserScalableContent: Boolean get() = runtime.settings.forceUserScalableEnabled set(value) { runtime.settings.forceUserScalableEnabled = value } + + override var torSecurityLevel: Int + get() = runtime.settings.torSecurityLevel + set(value) { + value.let { + runtime.settings.torSecurityLevel = it + } + } }.apply { defaultSettings?.let { this.javascriptEnabled = it.javascriptEnabled @@ -631,6 +639,7 @@ class GeckoEngine( this.fontSizeFactor = it.fontSizeFactor this.forceUserScalableContent = it.forceUserScalableContent this.loginAutofillEnabled = it.loginAutofillEnabled + this.torSecurityLevel = it.torSecurityLevel } } ===================================== components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt ===================================== @@ -174,6 +174,11 @@ abstract class Settings { * Setting to force the ability to scale the content */ open var forceUserScalableContent: Boolean by UnsupportedSetting() + + /** + * Setting to control the current security level + */ + open var torSecurityLevel: Int by UnsupportedSetting() } /** @@ -208,7 +213,8 @@ data class DefaultSettings( override var fontInflationEnabled: Boolean? = null, override var fontSizeFactor: Float? = null, override var forceUserScalableContent: Boolean = false, - override var loginAutofillEnabled: Boolean = false + override var loginAutofillEnabled: Boolean = false, + override var torSecurityLevel: Int = 0 ) : Settings() class UnsupportedSetting<T> { View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… 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] fixup! Bug 40041: Implement Tor Network Settings
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: 74d55403 by Matthew Finkel at 2020-09-30T22:41:23+00:00 fixup! Bug 40041: Implement Tor Network Settings Bug 40066: Correct conditional statement for hiding snowflake - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt ===================================== @@ -42,7 +42,7 @@ class TorBridgeConfigFragment : PreferenceFragmentCompat() { addToRadioGroup(*builtinBridgeRadioGroups.toTypedArray()) // Snowflake is not available on Release at this time. - if (Config.channel.isReleased) { + if (Config.channel.isRelease) { radioSnowflake.apply { isVisible = false } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/74d5540329f4a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/74d5540329f4a… You're receiving this email because of your account on gitlab.torproject.org.

1 0