- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-82.0b7-10.0-1] Merge remote-tracking branch 'acatgl/40199' into tor-browser-82.0b7-10.0-1
by sysrqb＠torproject.org 23 Oct '20

23 Oct '20

commit 0ab249ad7cc37ce4024a753e03dd9dc86fb03253 Merge: ff917f5073ba 00d90dd2a581 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 23 18:03:08 2020 +0000 Merge remote-tracking branch 'acatgl/40199' into tor-browser-82.0b7-10.0-1 .../mozilla/geckoview/GeckoRuntimeSettings.java | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-)

1 0

[tor-browser/tor-browser-82.0b7-10.0-1] Merge remote-tracking branch 'acatgl/40198+1' into tor-browser-82.0b7-10.0-1
by sysrqb＠torproject.org 23 Oct '20

23 Oct '20

commit 56077640f8acf22ba6591ded019492237d48e910 Merge: 0ab249ad7cc3 fd2a780a04f5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 23 18:04:19 2020 +0000 Merge remote-tracking branch 'acatgl/40198+1' into tor-browser-82.0b7-10.0-1 mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+)

1 0

[Git][tpo/applications/fenix][tor-browser-82.1.1-10.0-1] Bug 40087: Implement a switch for english locale spoofing
by Matthew Finkel 23 Oct '20

23 Oct '20

Matthew Finkel pushed to branch tor-browser-82.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 54f42ec4 by Alex Catarineu at 2020-10-23T17:58:56+00:00 Bug 40087: Implement a switch for english locale spoofing - - - - - 7 changed files: - app/src/main/java/org/mozilla/fenix/components/Core.kt - app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt - app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt - app/src/main/java/org/mozilla/fenix/utils/Settings.kt - app/src/main/res/layout/fragment_locale_settings.xml - app/src/main/res/values/preference_keys.xml - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -93,7 +93,8 @@ class Core(private val context: Context, private val crashReporter: CrashReporti suspendMediaWhenInactive = false, forceUserScalableContent = context.settings().forceEnableZoom, loginAutofillEnabled = context.settings().shouldAutofillLogins, - torSecurityLevel = context.settings().torSecurityLevel().intRepresentation + torSecurityLevel = context.settings().torSecurityLevel().intRepresentation, + spoofEnglish = context.settings().spoofEnglish ) GeckoEngine( ===================================== app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt ===================================== @@ -7,6 +7,7 @@ package org.mozilla.fenix.settings.advanced import android.app.Activity import android.content.Context import mozilla.components.support.locale.LocaleManager +import org.mozilla.fenix.ext.components import java.util.Locale interface LocaleSettingsController { @@ -55,5 +56,9 @@ class DefaultLocaleSettingsController( config.setLocale(locale) config.setLayoutDirection(locale) resources.updateConfiguration(config, resources.displayMetrics) + // A slightly hacky way of triggering a `runtime.settings.locales` update, + // so that the locales are updated in GeckoView. + val spoofEnglish = context.components.core.engine.settings.spoofEnglish + context.components.core.engine.settings.spoofEnglish = spoofEnglish } } ===================================== app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt ===================================== @@ -20,6 +20,8 @@ import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.locale.LocaleManager import org.mozilla.fenix.R import org.mozilla.fenix.components.StoreProvider +import org.mozilla.fenix.ext.requireComponents +import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.showToolbar class LocaleSettingsFragment : Fragment() { @@ -38,7 +40,9 @@ class LocaleSettingsFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View? { - val view = inflater.inflate(R.layout.fragment_locale_settings, container, false) + val view = inflater.inflate(R.layout.fragment_locale_settings, container, false).also { + bindEnableSwitch(it) + } store = getStore() interactor = LocaleSettingsInteractor( @@ -51,6 +55,16 @@ class LocaleSettingsFragment : Fragment() { return view } + @SuppressWarnings("LongMethod") + private fun bindEnableSwitch(view: View) { + val switch = view.enable_switch + switch.isChecked = requireComponents.core.engine.settings.spoofEnglish + switch.setOnCheckedChangeListener { _, isChecked -> + context?.settings()?.spoofEnglish = isChecked + requireComponents.core.engine.settings.spoofEnglish = isChecked + } + } + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.languages_list, menu) val searchItem = menu.findItem(R.id.search) ===================================== app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -204,6 +204,11 @@ class Settings(private val appContext: Context) : PreferencesHolder { else -> SecurityLevel.STANDARD } + var spoofEnglish by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_spoof_english), + default = false + ) + // If any of the prefs have been modified, quit displaying the fenix moved tip fun shouldDisplayFenixMovingTip(): Boolean = preferences.getBoolean( ===================================== app/src/main/res/layout/fragment_locale_settings.xml ===================================== @@ -7,13 +7,30 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <com.google.android.material.switchmaterial.SwitchMaterial + android:id="@+id/enable_switch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|end" + android:background="?android:attr/selectableItemBackground" + android:checked="true" + android:clickable="true" + android:focusable="true" + android:layout_marginStart="54dp" + android:padding="16dp" + android:text="@string/tor_spoof_english" + android:textColor="?primaryText" + android:textSize="16sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> <FrameLayout android:id="@+id/locale_container" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/enable_switch" /> -</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout> ===================================== app/src/main/res/values/preference_keys.xml ===================================== @@ -253,4 +253,6 @@ <string name="pref_key_tor_network_settings_tor_ready">pref_key_tor_network_settings_tor_ready</string> <string name="pref_key_tor_network_settings_state">pref_key_tor_network_settings_state</string> <string name="pref_key_tor_network_settings_bridges_enabled">pref_key_tor_network_settings_bridges_enabled</string> + + <string name="pref_key_spoof_english" translatable="false">pref_key_spoof_english</string> </resources> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -70,4 +70,6 @@ <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> +  + <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/54f42ec477b78… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/54f42ec477b78… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 2 commits: Bug 40087: Implement a switch for english locale spoofing
by Matthew Finkel 23 Oct '20

23 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 6f44c91a by Alex Catarineu at 2020-10-19T21:40:42+02:00 Bug 40087: Implement a switch for english locale spoofing - - - - - bde950d3 by Matthew Finkel at 2020-10-23T17:57:27+00:00 Merge remote-tracking branch 'acatgl/40087+2' into tor-browser-82.0.0b4-10.0-1 - - - - - 7 changed files: - app/src/main/java/org/mozilla/fenix/components/Core.kt - app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt - app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt - app/src/main/java/org/mozilla/fenix/utils/Settings.kt - app/src/main/res/layout/fragment_locale_settings.xml - app/src/main/res/values/preference_keys.xml - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -93,7 +93,8 @@ class Core(private val context: Context, private val crashReporter: CrashReporti suspendMediaWhenInactive = false, forceUserScalableContent = context.settings().forceEnableZoom, loginAutofillEnabled = context.settings().shouldAutofillLogins, - torSecurityLevel = context.settings().torSecurityLevel().intRepresentation + torSecurityLevel = context.settings().torSecurityLevel().intRepresentation, + spoofEnglish = context.settings().spoofEnglish ) GeckoEngine( ===================================== app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt ===================================== @@ -7,6 +7,7 @@ package org.mozilla.fenix.settings.advanced import android.app.Activity import android.content.Context import mozilla.components.support.locale.LocaleManager +import org.mozilla.fenix.ext.components import java.util.Locale interface LocaleSettingsController { @@ -55,5 +56,9 @@ class DefaultLocaleSettingsController( config.setLocale(locale) config.setLayoutDirection(locale) resources.updateConfiguration(config, resources.displayMetrics) + // A slightly hacky way of triggering a `runtime.settings.locales` update, + // so that the locales are updated in GeckoView. + val spoofEnglish = context.components.core.engine.settings.spoofEnglish + context.components.core.engine.settings.spoofEnglish = spoofEnglish } } ===================================== app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt ===================================== @@ -20,6 +20,8 @@ import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.locale.LocaleManager import org.mozilla.fenix.R import org.mozilla.fenix.components.StoreProvider +import org.mozilla.fenix.ext.requireComponents +import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.showToolbar class LocaleSettingsFragment : Fragment() { @@ -38,7 +40,9 @@ class LocaleSettingsFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View? { - val view = inflater.inflate(R.layout.fragment_locale_settings, container, false) + val view = inflater.inflate(R.layout.fragment_locale_settings, container, false).also { + bindEnableSwitch(it) + } store = getStore() interactor = LocaleSettingsInteractor( @@ -51,6 +55,16 @@ class LocaleSettingsFragment : Fragment() { return view } + @SuppressWarnings("LongMethod") + private fun bindEnableSwitch(view: View) { + val switch = view.enable_switch + switch.isChecked = requireComponents.core.engine.settings.spoofEnglish + switch.setOnCheckedChangeListener { _, isChecked -> + context?.settings()?.spoofEnglish = isChecked + requireComponents.core.engine.settings.spoofEnglish = isChecked + } + } + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.languages_list, menu) val searchItem = menu.findItem(R.id.search) ===================================== app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -204,6 +204,11 @@ class Settings(private val appContext: Context) : PreferencesHolder { else -> SecurityLevel.STANDARD } + var spoofEnglish by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_spoof_english), + default = false + ) + // If any of the prefs have been modified, quit displaying the fenix moved tip fun shouldDisplayFenixMovingTip(): Boolean = preferences.getBoolean( ===================================== app/src/main/res/layout/fragment_locale_settings.xml ===================================== @@ -7,13 +7,30 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <com.google.android.material.switchmaterial.SwitchMaterial + android:id="@+id/enable_switch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|end" + android:background="?android:attr/selectableItemBackground" + android:checked="true" + android:clickable="true" + android:focusable="true" + android:layout_marginStart="54dp" + android:padding="16dp" + android:text="@string/tor_spoof_english" + android:textColor="?primaryText" + android:textSize="16sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> <FrameLayout android:id="@+id/locale_container" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/enable_switch" /> -</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout> ===================================== app/src/main/res/values/preference_keys.xml ===================================== @@ -253,4 +253,6 @@ <string name="pref_key_tor_network_settings_tor_ready">pref_key_tor_network_settings_tor_ready</string> <string name="pref_key_tor_network_settings_state">pref_key_tor_network_settings_state</string> <string name="pref_key_tor_network_settings_bridges_enabled">pref_key_tor_network_settings_bridges_enabled</string> + + <string name="pref_key_spoof_english" translatable="false">pref_key_spoof_english</string> </resources> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -70,4 +70,6 @@ <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> +  + <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/e7ca4137fe8e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/e7ca4137fe8e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-60.0.5-10.0-1
by Matthew Finkel 23 Oct '20

23 Oct '20

Matthew Finkel pushed new branch android-components-60.0.5-10.0-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-82.1.1-10.0-1
by Matthew Finkel 23 Oct '20

23 Oct '20

Matthew Finkel pushed new branch tor-browser-82.1.1-10.0-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-82.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-60.0.3-10.0-1] Bug 40024: Disable tracking protection by default
by Matthew Finkel 23 Oct '20

23 Oct '20

Matthew Finkel pushed to branch android-components-60.0.3-10.0-1 at The Tor Project / Applications / android-components Commits: ececa072 by Matthew Finkel at 2020-10-23T13:52:05+00:00 Bug 40024: Disable tracking protection by default - - - - - 1 changed file: - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt Changes: ===================================== components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt ===================================== @@ -297,6 +297,8 @@ abstract class EngineSession( fun none() = TrackingProtectionPolicy( trackingCategories = arrayOf(TrackingCategory.NONE), + useForPrivateSessions = false, + useForRegularSessions = false, cookiePolicy = ACCEPT_ONLY_FIRST_PARTY ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 2 commits: fixup! Bug 40028: Integrate Tor Controller into HomeFragment
by Matthew Finkel 23 Oct '20

23 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: a061d49c by Matthew Finkel at 2020-10-16T17:04:37+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment Bug 40068: Tor Service closes when changing theme - - - - - e7ca4137 by Matthew Finkel at 2020-10-23T14:11:39+00:00 Merge branch 'bug_40068_01' into tor-browser-82.0.0b4-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/FenixApplication.kt - app/src/main/java/org/mozilla/fenix/HomeActivity.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/FenixApplication.kt ===================================== @@ -67,6 +67,8 @@ open class FenixApplication : LocaleAwareApplication(), Provider { private val logger = Logger("FenixApplication") + var terminating = false + open val components by lazy { Components(this) } var visibilityLifecycleCallback: VisibilityLifecycleCallback? = null @@ -96,9 +98,19 @@ open class FenixApplication : LocaleAwareApplication(), Provider { setupInMainProcessOnly() } + fun isTerminating() = terminating + + fun terminate() { + onTerminate() + System.exit(0) + } + override fun onTerminate() { + terminating = true + super.onTerminate() components.torController.stop() + components.torController.stopTor() } protected open fun initializeGlean() { ===================================== app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -131,6 +131,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { private var isToolbarInflated = false + private var isBeingRecreated = false + private val webExtensionPopupFeature by lazy { WebExtensionPopupFeature(components.core.store, ::openPopup) } @@ -362,10 +364,14 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { ) privateNotificationObserver?.stop() - components.torController.stopTor() - // Explicitly change our internal state because the status broadcast from tor-android-service may - // arrive after we unregister the broadcast listener when the app is exiting. - components.torController.setTorStopped() + if (!isBeingRecreated && !(application as FenixApplication).isTerminating()) { + // We assume the Activity is being destroyed because the user + // swiped away the app on the Recent screen. When this happens, + // we assume the user expects the entire Application is destroyed + // and not only the top Activity/Task. Therefore we kill the + // underlying Application, as well. + (application as FenixApplication).terminate() + } } override fun onConfigurationChanged(newConfig: Configuration) { @@ -385,6 +391,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { message = "recreate()" ) + isBeingRecreated = true + super.recreate() } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/8c969c0c9aa5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/8c969c0c9aa5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-60.0.3-10.0-1] 2 commits: Bug 40020: Disable third-party cookies
by Matthew Finkel 23 Oct '20

23 Oct '20

Matthew Finkel pushed to branch android-components-60.0.3-10.0-1 at The Tor Project / Applications / android-components Commits: 6f1380d0 by Matthew Finkel at 2020-10-22T18:36:03+00:00 Bug 40020: Disable third-party cookies - - - - - d3423ea9 by Matthew Finkel at 2020-10-23T13:51:03+00:00 Merge branch 'bug_40020_00' into android-components-60.0.3-10.0-1 - - - - - 1 changed file: - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt Changes: ===================================== components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt ===================================== @@ -8,8 +8,8 @@ import android.content.Intent import android.graphics.Bitmap import androidx.annotation.CallSuper import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.Companion.RECOMMENDED -import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.CookiePolicy.ACCEPT_ALL import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.CookiePolicy.ACCEPT_NON_TRACKERS +import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.CookiePolicy.ACCEPT_ONLY_FIRST_PARTY import mozilla.components.concept.engine.content.blocking.Tracker import mozilla.components.concept.engine.history.HistoryItem import mozilla.components.concept.engine.manifest.WebAppManifest @@ -297,7 +297,7 @@ abstract class EngineSession( fun none() = TrackingProtectionPolicy( trackingCategories = arrayOf(TrackingCategory.NONE), - cookiePolicy = ACCEPT_ALL + cookiePolicy = ACCEPT_ONLY_FIRST_PARTY ) /** 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/android-components][android-components-60.0.3-10.0-1] Bug 40023: Stop PrivateNotificationService
by Matthew Finkel 23 Oct '20

23 Oct '20

Matthew Finkel pushed to branch android-components-60.0.3-10.0-1 at The Tor Project / Applications / android-components Commits: 2ca9d997 by Matthew Finkel at 2020-10-22T21:55:11+00:00 Bug 40023: Stop PrivateNotificationService - - - - - 1 changed file: - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt Changes: ===================================== components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt ===================================== @@ -47,6 +47,7 @@ class PrivateNotificationFeature<T : AbstractPrivateNotificationService>( } override fun stop() { + applicationContext.stopService(Intent(applicationContext, notificationServiceClass.java)) scope?.cancel() } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/… You're receiving this email because of your account on gitlab.torproject.org.

1 0