- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.4.0esr-10.5-1] fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit fe77759e2e3227344bb7dec64cf58fccd596c497 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 29 22:03:28 2020 +0100 fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop Fixes #40137: Built-in https-everywhere storage is not migrated to idb --- toolkit/components/extensions/Extension.jsm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm index 876e636be3db..7dbd888b1710 100644 --- a/toolkit/components/extensions/Extension.jsm +++ b/toolkit/components/extensions/Extension.jsm @@ -211,6 +211,7 @@ const LOGGER_ID_BASE = "addons.webextension."; const UUID_MAP_PREF = "extensions.webextensions.uuids"; const LEAVE_STORAGE_PREF = "extensions.webextensions.keepStorageOnUninstall"; const LEAVE_UUID_PREF = "extensions.webextensions.keepUuidOnUninstall"; +const PERSISTENT_EXTENSIONS = new Set(["https-everywhere-eff(a)eff.org"]); const COMMENT_REGEXP = new RegExp( String.raw` @@ -331,7 +332,10 @@ var ExtensionAddonObserver = { return; } - if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false)) { + if ( + !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) && + !PERSISTENT_EXTENSIONS.has(addon.id) + ) { // Clear browser.storage.local backends. AsyncShutdown.profileChangeTeardown.addBlocker( `Clear Extension Storage ${addon.id} (File Backend)`, @@ -384,7 +388,10 @@ var ExtensionAddonObserver = { ExtensionPermissions.removeAll(addon.id); - if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false)) { + if ( + !Services.prefs.getBoolPref(LEAVE_UUID_PREF, false) && + !PERSISTENT_EXTENSIONS.has(addon.id) + ) { // Clear the entry in the UUID map UUIDMap.remove(addon.id); } @@ -2474,7 +2481,8 @@ class Extension extends ExtensionData { ); } else if ( this.startupReason === "ADDON_INSTALL" && - !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) + !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) && + !PERSISTENT_EXTENSIONS.has(this.id) ) { // If the extension has been just installed, set it as migrated, // because there will not be any data to migrate.

1 0

[tor-browser/tor-browser-78.4.0esr-10.5-1] Merge remote-tracking branch 'acatgl/40137' into tor-browser-78.4.0esr-10.5-1
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 0f1ea47ff08d81d50195b509aabaea0fc9188e51 Merge: f5157a69e88c fe77759e2e32 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 4 20:57:18 2020 +0000 Merge remote-tracking branch 'acatgl/40137' into tor-browser-78.4.0esr-10.5-1 toolkit/components/extensions/Extension.jsm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

1 0

[torbutton/master] fixup! Bug 40013: End of year 2020 Fundraising campaign
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 983c073b337eac1bbdcaac7134811f93a5d97daa Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 30 12:53:08 2020 +0100 fixup! Bug 40013: End of year 2020 Fundraising campaign --- chrome/content/aboutTor/aboutTor.xhtml | 1 + chrome/skin/aboutTor.css | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 3a242a36..25267fc3 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -49,6 +49,7 @@ </div> <div id="eoy2020_1"> <p id="eoy2020_resist">&aboutTor.ey2020.resistsurveillance;</p> + <p id="eoy2020_match"><a href="https://blog.torproject.org/friends-of-tor-match-2020">&aboutTor.ey2020.donationmatch;</a></p> </div> <div id="eoy2020_3"> <a id="eoy2020_donate" href="https://www.torproject.org/donate/donate-usetor-default">&aboutTor.donationBanner.buttonA;</a> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 223a5c73..e6f5c4ee 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -362,6 +362,11 @@ body[eoy2020] .torcontent-logo { display: none!important; } +#eoy2020_1 { + width: 70%; + background: #000; +} + #eoy2020_3 { padding-top: 10px; padding-bottom: 30px; @@ -376,14 +381,36 @@ body[eoy2020] .torcontent-logo { text-align: left; color: white; font-family: "TerminalGrotesque", monospace; - font-size: 25px; - width: 70%; + font-size: 27px; + padding: 9px 0; } #eoy2020_resist:dir(rtl) { text-align: right; } +#eoy2020_match { + font-size: 16px; + padding: 0 0 20px 0; + font-family: "Courier New", monospace; + font-weight: bold; + text-align: left; +} + +#eoy2020_match a { + color: #9D4AE8; + text-decoration: unset; +} + +#eoy2020_match a:hover { + color: #4DFB00; + text-decoration: unset; +} + +#eoy2020_match:dir(rtl) { + text-align: right; +} + #eoy2020_useamask { line-height: 53px; text-align: left;

1 0

[torbutton/master] Merge remote-tracking branch 'acatgl/40022+1'
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit b0739b02caacea311d54192d22005aaa88505b11 Merge: 86c73f63 983c073b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 4 20:23:06 2020 +0000 Merge remote-tracking branch 'acatgl/40022+1' chrome/content/aboutTor/aboutTor.xhtml | 1 + chrome/skin/aboutTor.css | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-)

1 0

[torbutton/master] fixup! Bug 40013: End of year 2020 Fundraising campaign
by sysrqb＠torproject.org 03 Nov '20

03 Nov '20

commit 86c73f63b9524b30a9e87018a5f2ecbaec0fd047 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Nov 3 22:49:36 2020 +0000 fixup! Bug 40013: End of year 2020 Fundraising campaign Bug 40022: EOY November Update - Matching --- chrome/locale/en-US/aboutTor.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd index 13e2d8a2..00c8256d 100644 --- a/chrome/locale/en-US/aboutTor.dtd +++ b/chrome/locale/en-US/aboutTor.dtd @@ -33,3 +33,4 @@  <!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.donationmatch "Your donation will be matched by Friends of Tor.">

1 0

[Git][tpo/applications/fenix][tor-browser-82.1.1-10.0-1] fixup! Bug 40098 - Add EOY home screen
by Matthew Finkel 30 Oct '20

30 Oct '20

Matthew Finkel pushed to branch tor-browser-82.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: ea881b71 by Matthew Finkel at 2020-10-30T17:11:46+00:00 fixup! Bug 40098 - Add EOY home screen - - - - - 1 changed file: - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -73,6 +73,6 @@  <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string> - <string name="tor_useamask_usetor">Use a mask. Use Tor.</string> + <string name="tor_useamask_usetor">Use a mask, use Tor.</string> <string name="tor_resistsurveillance">Resist the surveillance pandemic.</string> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/ea881b7136b8f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/ea881b7136b8f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

30 Oct '20

Matthew Finkel pushed to branch tor-browser-82.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 5c08ba43 by Matthew Finkel at 2020-10-27T23:12:50+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment Bug 40100: Resolve startup crashes in debug build - - - - - 636f214a by Matthew Finkel at 2020-10-29T19:53:19+00:00 fixup! Bug 40028: Define bootstrapping events and Quick Start Bug 40100: Resolve startup crashes in debug build - - - - - b3df7adb by Matthew Finkel at 2020-10-30T14:57:49+00:00 Merge branch 'bug_40100_00' into tor-browser-82.1.1-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/FenixApplication.kt - app/src/main/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/FenixApplication.kt ===================================== @@ -160,8 +160,10 @@ open class FenixApplication : LocaleAwareApplication(), Provider { runBlocking { megazordSetup.await(); } } - // Give TAS the base Context - Prefs.setContext(applicationContext) + GlobalScope.launch(Dispatchers.IO) { + // Give TAS the base Context + Prefs.setContext(applicationContext) + } } setupLeakCanary() ===================================== app/src/main/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt ===================================== @@ -6,20 +6,24 @@ package org.mozilla.fenix.tor.bootstrap import android.content.Context import android.content.SharedPreferences +import android.os.StrictMode import androidx.annotation.VisibleForTesting import mozilla.components.support.ktx.android.content.PreferencesHolder import mozilla.components.support.ktx.android.content.booleanPreference +import org.mozilla.fenix.ext.resetPoliciesAfter class TorQuickStart(context: Context) : PreferencesHolder { - override val preferences: SharedPreferences = context.getSharedPreferences( - PREF_NAME_TOR_BOOTSTRAP_KEY, - Context.MODE_PRIVATE - ) + override val preferences: SharedPreferences = StrictMode.allowThreadDiskReads().resetPoliciesAfter { + context.getSharedPreferences( + PREF_NAME_TOR_BOOTSTRAP_KEY, + Context.MODE_PRIVATE + ) + } private var torQuickStart by booleanPreference(TOR_QUICK_START, default = false) - fun quickStartTor() = torQuickStart + fun quickStartTor() = StrictMode.allowThreadDiskReads().resetPoliciesAfter { torQuickStart } fun enableQuickStartTor() { torQuickStart = true View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/35e959772b2e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/35e959772b2e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-82.1.1-10.0-1] 2 commits: Bug 40098 - Add EOY home screen
by Matthew Finkel 30 Oct '20

30 Oct '20

Matthew Finkel pushed to branch tor-browser-82.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 879a452f by Matthew Finkel at 2020-10-30T03:15:39+00:00 Bug 40098 - Add EOY home screen - - - - - 35e95977 by Matthew Finkel at 2020-10-30T14:52:50+00:00 Merge commit '879a452f8af6a61cef73a8b4fd362ae8f70dafd0' into tor-browser-82.1.1-10.0-1 - - - - - 10 changed files: - LICENSE - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - + app/src/main/res/drawable/ic_illo.png - + app/src/main/res/drawable/ic_tape.png - + app/src/main/res/font/terminal_grotesque.otf - + app/src/main/res/font/white_on_black.ttf - app/src/main/res/layout/fragment_home.xml - app/src/main/res/values/styles.xml - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== LICENSE ===================================== @@ -371,3 +371,120 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. + +=============================================================================== + +"White On Black" font embedded in chrome/skin/aboutTorFonts.css is licensed under: + +Non Exclusive License Agreement + +Object: Imagex font called « White on Black » +Owner: Daniel Hochard + +1. Allowed uses +The user may use this font on any surface such as logo, paper, web sites, +textile, Online medias, except TV, cinéma and advertising campaign. +2. Number of users : 5 +All users must belong to the same company or household purchasing the font. +3. Modifications +The user can modify this font itself without written consent of the owner. +4. This font belongs to Daniel Hochard. The user may not sell it as a font (in a +font bank or a commercial fonts web site, for example). +The fee for this font was paid on paypal the 29 september 2020 + +=============================================================================== + +"Terminal Grotesque Open" font embedded in chrome/skin/aboutTorFonts.css is licensed +under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +=============================================================================== + +SIL OPEN FONT LICENSE + +Version 1.1 - 26 February 2007 + +PREAMBLE + +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. +DEFINITIONS + +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting — in part or in whole — any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. +PERMISSION & CONDITIONS + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. +TERMINATION + +This license becomes null and void if any of the above conditions are +not met. +DISCLAIMER + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -74,6 +74,7 @@ import mozilla.components.feature.top.sites.TopSitesFeature import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.android.content.res.resolveAttribute +import mozilla.components.support.locale.LocaleManager import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.FeatureFlags @@ -105,6 +106,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.topsites.DefaultTopSitesView import org.mozilla.fenix.onboarding.FenixOnboarding import org.mozilla.fenix.settings.SupportUtils +import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.theme.ThemeManager @@ -270,6 +272,20 @@ class HomeFragment : Fragment() { adjustHomeFragmentView(currentMode.getCurrentMode(), view) showSessionControlView(view) + view.donate_now_button.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/donate/donate-usetor-mobile-${locale}" + activity.openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } + return view } @@ -401,6 +417,14 @@ class HomeFragment : Fragment() { toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING ) } + view.donate_now_button?.apply { + (layoutParams as ViewGroup.MarginLayoutParams).setMargins( + 0, + 0, + 0, + toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING + ) + } } } else { view.sessionControlRecyclerView?.apply { @@ -411,6 +435,38 @@ class HomeFragment : Fragment() { height - SESSION_CONTROL_VIEW_PADDING ) } + view.donate_now_button?.apply { + (layoutParams as ViewGroup.MarginLayoutParams).setMargins( + 0, + 0, + 0, + height - SESSION_CONTROL_VIEW_PADDING + ) + } + } + } + + // Hide the EOY image during Onboarding, too. + view?.illo_image?.apply { + visibility = if (onboarding.userHasBeenOnboarded()) { + View.VISIBLE + } else { + View.GONE + } + } + // Hide the EOY donate button during Onboarding, too. + view?.donate_now_button?.apply { + visibility = if (onboarding.userHasBeenOnboarded()) { + View.VISIBLE + } else { + View.GONE + } + } + view?.resistsurveillance?.apply { + visibility = if (onboarding.userHasBeenOnboarded()) { + View.VISIBLE + } else { + View.GONE } } // Hide the onion pattern during Onboarding, too. ===================================== app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -32,7 +32,7 @@ abstract class ThemeManager { @get:StyleRes val currentThemeResource get() = when (currentTheme) { BrowsingMode.Normal -> R.style.NormalTheme - BrowsingMode.Private -> R.style.PrivateTheme + BrowsingMode.Private -> R.style.PrivateEOYTheme } /** ===================================== app/src/main/res/drawable/ic_illo.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/ic_illo.png differ ===================================== app/src/main/res/drawable/ic_tape.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/ic_tape.png differ ===================================== app/src/main/res/font/terminal_grotesque.otf ===================================== Binary files /dev/null and b/app/src/main/res/font/terminal_grotesque.otf differ ===================================== app/src/main/res/font/white_on_black.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/white_on_black.ttf differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -53,6 +53,7 @@ android:clickable="false" android:contentDescription="@string/app_name" android:focusable="false" + android:visibility="gone" android:importantForAccessibility="no" app:srcCompat="@mipmap/ic_launcher" app:layout_collapseMode="parallax" @@ -69,6 +70,7 @@ android:height="60dp" android:clickable="false" android:focusable="false" + android:visibility="gone" android:importantForAccessibility="no" android:lines="2" android:text="@string/app_name" @@ -83,19 +85,79 @@ android:id="@+id/exploreprivately" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center|center_vertical" - android:gravity="center_horizontal" + android:layout_gravity="center_vertical" + android:layout_marginStart="30dp" + android:layout_marginEnd="30dp" android:clickable="false" android:ellipsize="end" android:focusable="false" android:importantForAccessibility="no" - android:text="@string/tor_explore_privately" - android:fontFamily="Roboto-Medium" - android:textColor="#DEFFFFFF" + android:text="@string/tor_useamask_usetor" + android:fontFamily="@font/white_on_black" + android:textColor="#FFFFFFFF" android:textSize="40sp" + android:paddingTop="20dp" android:lineSpacingMultiplier="1.1" app:layout_scrollFlags="scroll" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical"> + + <TextView + android:id="@+id/resistsurveillance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="40dp" + android:layout_gravity="center_vertical" + android:clickable="false" + android:focusable="false" + android:gravity="start" + android:fontFamily="@font/terminal_grotesque" + android:importantForAccessibility="no" + android:lineSpacingMultiplier="1.1" + android:text="@string/tor_resistsurveillance" + android:textColor="#FFFFFFFF" + android:textSize="25sp" + android:visibility="visible" + app:layout_scrollFlags="scroll" /> + + <Button + android:id="@+id/donate_now_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="30dp" + android:background="@drawable/ic_tape" + android:gravity="center|start" + android:fontFamily="@font/terminal_grotesque" + android:paddingStart="15dp" + android:paddingEnd="20dp" + android:text="@string/tor_onboarding_donate_button" + android:textColor="#FF000000" + android:textSize="25sp" + android:textAllCaps="false" + android:textStyle="bold" + android:visibility="visible" + tools:ignore="ButtonStyleXmlDetector" /> + </LinearLayout> + + <ImageView + android:id="@+id/illo_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + app:srcCompat="@drawable/ic_illo" + tools:ignore="ContentDescription" + app:layout_scrollFlags="scroll" /> + + </LinearLayout> + </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView ===================================== app/src/main/res/values/styles.xml ===================================== @@ -269,6 +269,10 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> + <style name="PrivateEOYTheme" parent="PrivateThemeBase" > + <item name="homeBackground">@android:color/black</item> + </style> +  <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -72,4 +72,7 @@  <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string> + + <string name="tor_useamask_usetor">Use a mask. Use Tor.</string> + <string name="tor_resistsurveillance">Resist the surveillance pandemic.</string> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/b30df1e9dab9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/b30df1e9dab9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-spec/master] Bug 40004: Add Quickstart proposal idea
by sysrqb＠torproject.org 29 Oct '20

29 Oct '20

commit b35b4376a5ee18212f23f43b3de14a2aac0e2595 Author: antonela <antonela(a)torproject.org> Date: Tue Oct 6 11:16:48 2020 -0300 Bug 40004: Add Quickstart proposal idea --- proposals/ideas/xxx-quickstart.txt | 131 +++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/proposals/ideas/xxx-quickstart.txt b/proposals/ideas/xxx-quickstart.txt new file mode 100644 index 0000000..395b8c4 --- /dev/null +++ b/proposals/ideas/xxx-quickstart.txt @@ -0,0 +1,131 @@ +Filename: xxx-quickstart.txt +Title: Tor Browser Quickstart +Author: antonela +Created: 09-Sep-2020 +Status: Draft +Target: Tor Browser 10.5 + +1. Introduction + + This proposal aims to improve the user experience of Tor Browser when connecting to the Tor network. + +2. Motivation + + Tor Browser is opened more than 2 million times a day. In the last years, we have been working on qualitatively improving the entire Tor browser user journey: from discovering, finding, downloading, installing, starting, and browsing, we released a seamless and familiar experience for our largest set of users. But, launching the Tor Browser for the first time is still being a frictional experience. + + Tor Launcher has been confusing for users. Past research exposed those pain points and how that confusion delays the decision making flow by cognitive overloading [0]. Also, known issues around Tor Launcher like the time gap between Tor Launcher and the main browser windows opening on first-time installers have made Tor Browser starting even more disappointing for first-time users. + + This proposal aims to improve the bootstrapping flow for first-time and recurrent users by removing Tor Launcher UI, making Tor bootstrapping automatic, and relying on a better UI embedded in the main browser screen as visual progress feedback. We will also consider the censored user's experience by informing detected censorship and suggesting and providing bridges to connect to the Tor network successfully. + +3. The case of the censored user + + Around 2% of daily Tor users need bridges to reach the Tor network [1]. In any case, this small percentage doesn't enable us to de-prioritize the need of these users. Instead, this proposal will also provide a user experience that contemplates censored users' need to access the network by making Tor Browser proactive to detect censorship and suggest Bridges. + +3.1 Bridges + + It is difficult for a user to select between a different bridge option relying on its name if they don't know what that bridge does for them. A usual flow for users requesting bridges is trying in-build Tor Browser bridges and failing to connect until they work. As well, users with specific needs are pointed to specific bridges by trusted community members, and they pick the recommended choice without a technical background. + + Over the years, Bridges' technology has been improving as how the censorship arms race has been developing. OBSF3, OBSF4, Meek, Snowflake, and more proxy techniques are available for successfully reaching the Tor network. Regular users cannot differentiate between the technologies under the construction of Bridges. + + I suggest attaching the name **"bridge"** to any intermediate node that allows users to reach the network. By unifying the vocabulary in the interface and our user manuals, we will simplify the complexity behind all this technology by warning and educating users about bridges uses. + + This strategic decision will allow the community to continue developing technology for bridges without moving the attention to the technical name but the conceptual solution [2]. + +3.2 Detecting censorship + + As discussed in the past, it is plausible for us to use retrospective data or a Tor reachability test in any fashion to detect network interference in the user's NAT and act upon that [3][4][7]. + + Most of the time, users get aware of a kind of network interference when they try to connect to the network, and the bootstrapping fails. But even in those cases, most users have not the technical background to understand nor explain that censorship experience. + + Within this proposal, the Tor Browser will be able to detect censorship for users and suggest the best bridge available to connect. + +3.3 Suggesting Bridges + + With this iteration, we aim to make Tor Browser proactive on detecting censorship, respectful on asking user consent to use a Bridge and smart enough to open the best bridge available. + + Advanced users will be able to configure custom bridges, private bridges, friends bridges, and any tunnel they want via `about:preferences#Tor` - Bridges. + + Once censorship has been detected, Tor users will be able to opt-in for a Bridge connection to reach a successful connection [5]. + +4. Proposal + + Specifically, this proposal will handle this issues: + + - Remove gap between Tor Launcher window and main browser window https://bugs.torproject.org/27476 + - Improve user visual feedback on bootstrapping connection https://bugs.torproject.org/23486, https://bugs.torproject.org/23971 + - Show Tor log in Tor Browser https://bugs.torproject.org/9516 + - Firewall option is visible behind Tor Network Settings... but not during start-up https://bugs.torproject.org/24452 + - "Tor is censored in my country" does not cover some scenarios https://bugs.torproject.org/25431 + - Tor Launcher should suggest the use of bridges if Tor is dangerous in user's area https://bugs.torproject.org/11132 + - Inform users in Tor Launcher of which settings are best for them based on their country https://bugs.torproject.org/24527 + - Make it easier to add a bridge in network settings https://bugs.torproject.org/14638 + - Use OONI to inform Tor Launcher user workflow https://bugs.torproject.org/23838 + +4.1 Requirements + + R1 Remove Tor Launcher UI from the entire starting flow + + R2 Allow users to give consent on the first time use of automatic connection + + R3 Implement a new UI integrated with the main windows that provide visual feedback during tor bootstrapping. + + R4 Allow advanced users to customize their bootstrapping experience using an extra startup parameter. [8][13] + + R5 Develop a detecting network interference that allows users to request a bridge if it is needed. Users under controlled networks are detailed in section 3. + + R6 Continue keeping Tor Launcher repository for 3rd parties using their controllers or UI. + +4.2 User flow + + The user opens the Tor Browser and automatically connects. If interference is detected, then an explainer error page appears, and a Use a Bridge is offered. + +4.3 Quickstart + + Previous experiences of clients bootstrapping Tor without asking to Connect have been successful. Onionshare, the popular Tor sharing files app, doesn't request user action to bootstrap Tor. Instead, a minimal UI progress bar is shown during the 1 or 2 seconds bootstrapping happens. OnionBrowser, the Tor Browser for iOS also bootstrap automatically. Brave's Tor startup is transparent to the user and the bootstrapping visual progress feedback happens at the URL bar. + + Quickstart is the feature that enables an automatic Tor connection in Tor Browser. + + As a first step in introducing this feature, we may want to make this Opt-In by allowing users to give consent and save this setting in our persistent configuration. + + * Phase One - Userflow + + The user opens the app; the connecting screen appears. Like the current flow, user needs to click in the Connect button to connect to Tor. On first time users, we ask consent for automatic connections. [9, IMG 0.0] + + Opted-in recurrent users will go directly to `about:tor`. We will disable the URL bar and we will rely on a loading bar UI to render immediate visual feedback. + + A work in progress user interface for desktop [9] and mobile [10] is attached to the main ticket [12]. + + * Phase Two - Userflow + + The user opens the app; Tor bootstraps automatically. To enable phase two, we need a Tor reachability test in place as part of the Tor bootstrapping. If there is network interference, the interference detected screen appears and Use a Bridges is offered. + +4.4 Customizing Tor connection + + Specific use cases, as in users who want to hide the fact that are using Tor or users aware of censorship in their network, should be able to start Tor Browser offline, be directed to `about:preferences#tor` and configure their connection before Connect. A startup parameter should allow this option. + +4.5 Recovering from error + + During our product iteration cycles in this flow, there may be the case where the bridge that is being suggested does not work. We will allow users to try a Bridge again, and then we will move them to the manual configuration in `about:preferences#Tor` - Bridges. + + General Tor bootstrapping errors handling will not be covered in this proposal. + +5. User research + + Our ongoing user research over Tor Browser Start pain-points and bridges' use is being tracked in its corresponding ticket [14][15]. + +[0] https://github.com/lindanlee/PETS2017-paper +[1] https://metrics.torproject.org/userstats-relay-country.html vs https://metrics.torproject.org/userstats-bridge-country.html +[2] https://gitlab.torproject.org/tpo/anti-censorship/rdsys/-/issues/8 +[3] https://gitlab.torproject.org/tpo/community/outreach/-/issues/28531 +[4] https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/23839 +[5] https://gitlab.torproject.org/tpo/applications/tor-launcher/-/issues/34343 +[6] https://gitlab.torproject.org/tpo/anti-censorship/trac/-/issues/40004/desig… +[7] https://gitlab.torproject.org/tpo/core/tor/-/issues/30477 +[8] https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/34345 +[9] https://gitlab.torproject.org/tpo/anti-censorship/trac/-/issues/40004/desig… +[10] https://gitlab.torproject.org/tpo/anti-censorship/trac/-/issues/40004/desig… +[11] https://trac.torproject.org/projects/tor/ticket/31286 +[12] https://gitlab.torproject.org/tpo/anti-censorship/trac/-/issues/40004 +[13] https://tails.boum.org/blueprint/network_connection/ +[14] https://gitlab.torproject.org/tpo/anti-censorship/trac/-/issues/40003 +[15] https://gitlab.torproject.org/groups/tpo/-/milestones/7

1 0

[tor-browser-spec/master] Merge commit 'b35b4376a5ee18212f23f43b3de14a2aac0e2595'
by sysrqb＠torproject.org 29 Oct '20

29 Oct '20

commit d317676d3871423e1d59c6a8daf8b6128a1c0ced Merge: f936ca0 b35b437 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 29 19:30:29 2020 +0000 Merge commit 'b35b4376a5ee18212f23f43b3de14a2aac0e2595' proposals/ideas/xxx-quickstart.txt | 131 +++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+)

1 0