- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40126: Bump Node to 10.22.1 for mozilla83
by sysrqb＠torproject.org 06 Nov '20

06 Nov '20

commit 1810b4bbf66b8a8516fa4c27364adc830c341616 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 23 07:36:14 2020 +0000 Bug 40126: Bump Node to 10.22.1 for mozilla83 We adapt the download path, too, to the one Mozilla is using. --- projects/node/build | 2 +- projects/node/config | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/projects/node/build b/projects/node/build index 8cc8ea5..4a437be 100644 --- a/projects/node/build +++ b/projects/node/build @@ -11,7 +11,7 @@ [% END -%] distdir=/var/tmp/dist/[% project %] tar -xf [% c('input_files_by_name/node') %] -cd node-[% c('version') %] +cd node-v[% c('version') %] ./configure --prefix=$distdir make -j[% c("buildconf/num_procs") %] diff --git a/projects/node/config b/projects/node/config index b3534f4..55f8965 100644 --- a/projects/node/config +++ b/projects/node/config @@ -1,10 +1,18 @@ # vim: filetype=yaml sw=2 -version: v10.21.0 +version: '[% c("var/node_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: + node_version: 10.21.0 + node_hash: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b container: use_container: 1 +targets: + android: + var: + node_version: 10.22.1 + node_hash: f47f4725dcae137b26f8e2a7d0ab2c2c7f1f47e4f96834e6a9242f157132255f + input_files: - project: container-image - project: binutils @@ -13,6 +21,6 @@ input_files: - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' enable: '[% c("var/linux") %]' - - URL: 'https://nodejs.org/download/release/[% c("version") %]/node-[% c("version") %].tar.xz' - sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b + - URL: 'https://nodejs.org/dist/v[% c("var/node_version") %]/node-v[% c("var/node_version") %].tar.xz' + sha256sum: '[% c("var/node_hash") %]' name: node

1 0

[tor-browser-build/master] Bug 40127: Add additional libraries the dependency fetching misses
by sysrqb＠torproject.org 06 Nov '20

06 Nov '20

commit 098ca6fa8fcce19bafeb02f4d3ac97707b9a5de5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 6 10:48:31 2020 +0000 Bug 40127: Add additional libraries the dependency fetching misses --- projects/fenix/gradle-dependencies-list.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 07adc7f..8013616 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -538,6 +538,7 @@ ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcent 24d81621f82ac29fcdd9a74116031f5907a2343158e616f4573bbfa2434ae0d5 | https://jcenter.bintray.com/net/java/dev/jna/jna-platform/5.5.0/jna-platfor… 10569e3622e974d3e66255ba85923c125d84fa257ef2543d8ac1c658d9ebcd10 | https://jcenter.bintray.com/net/java/dev/jna/jna-platform/5.5.0/jna-platfor… c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.aar +0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.2.0/jna-5.2.0.j… aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.pom 12ef4a3c2ea685c9c816caa6a77ae8f17bb7727d8460f249925409acda270101 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.5.0/jna-5.5.0.aar b308faebfe4ed409de8410e0a632d164b2126b035f6eacff968d3908cafb4d9e | https://jcenter.bintray.com/net/java/dev/jna/jna/5.5.0/jna-5.5.0.jar @@ -773,6 +774,7 @@ db9a950ba9a190d04611e69b1732221ba7035c2796b7d8b6afa69840711cd0ee | https://jcent 6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… ad426ec76f52b1dcdf200f55495aea9a2d2796811884e8c4b514645061cf59f3 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… 9e82078f4dafe1cc2e28f308a317912a45c6a88fc83c51db6ba8cb0ea0829ef1 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… +6538f458473a42b6e2a92676f00d70d4fa0f6ae824d13c1e31c8051c196d2335 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 51be6791ac5aed9718a58b297c8c9081c9b704dfd72a849c4754a40da55ee236 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… f02d46222e4591a9e16b6bacce5dc6606c33b38912d916daa41d428ef6703020 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-debug/… 5ae9e4dd4e81c0bfc92b0d760651815792793be9ec4f8a2d308b4aea6adbb23a | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-debug/…

1 0

[tor-browser-build/master] Bug 40127: Update android-components for mozilla83-based Fenix
by sysrqb＠torproject.org 06 Nov '20

06 Nov '20

1 0

[tor-browser-build/master] Bug 40127: Update fenix for mozilla83-based Fenix
by sysrqb＠torproject.org 06 Nov '20

06 Nov '20

1 0

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

06 Nov '20

commit 5bb321d6b50d5bb07290435d024128c6e8009c21 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

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

06 Nov '20

commit 1d8d1107beb289aace55957724a35a3a91d5cc57 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

[tor-browser/tor-browser-83.0b1-10.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by sysrqb＠torproject.org 06 Nov '20

06 Nov '20

commit 087a51bb52090d11d8f8ccc77133158c6bcc480b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 4 09:37:57 2020 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 40211: Lower required build-tools version to 29.0.2 --- build/moz.configure/android-sdk.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/moz.configure/android-sdk.configure b/build/moz.configure/android-sdk.configure index 2eb4c8ceae09..4ff0bc6f220e 100644 --- a/build/moz.configure/android-sdk.configure +++ b/build/moz.configure/android-sdk.configure @@ -41,7 +41,7 @@ def android_sdk_root(value): @depends('--help') def android_sdk_version(_): - return namespace(build_tools_version='29.0.3', target_sdk_version='29') + return namespace(build_tools_version='29.0.2', target_sdk_version='29') @depends(android_sdk_root, android_sdk_version)

1 0

[Git][tpo/applications/fenix][tor-browser-83.0.0b2-10.0-1] 52 commits: Bug #40002: Add GitLab CI
by Matthew Finkel 06 Nov '20

06 Nov '20

Matthew Finkel pushed to branch tor-browser-83.0.0b2-10.0-1 at The Tor Project / Applications / fenix Commits: 4eaa75b7 by Matthew Finkel at 2020-10-29T20:07:32+00:00 Bug #40002: Add GitLab CI - - - - - f6dde791 by Matthew Finkel at 2020-10-29T20:07:32+00:00 Bug 40020: Change applicationId - - - - - 721cf4d3 by Matthew Finkel at 2020-10-29T20:07:32+00:00 Bug 40020: Change app name - - - - - bda00391 by Matthew Finkel at 2020-10-29T20:09:01+00:00 Bug 40020: Change deeplink scheme - - - - - 602684e5 by Matthew Finkel at 2020-10-29T20:09:02+00:00 Bug 33594: Disable data collection by default (Glean) - - - - - 82da0568 by Matthew Finkel at 2020-10-29T20:09:02+00:00 Bug 40019: Adjust is disabled on Release when data collection is disabled - - - - - 9f7abf8a by Matthew Finkel at 2020-10-29T20:09:02+00:00 Bug 34338: Disable the crash reporter - - - - - b1be68aa by Matthew Finkel at 2020-10-29T20:09:02+00:00 Bug 40014: Neuter Google Advertising ID - - - - - 6db883c1 by Matthew Finkel at 2020-10-29T20:09:02+00:00 Bug 40018: Disable Push service - - - - - cd263a56 by Alex Catarineu at 2020-10-29T20:11:08+00:00 Bug 40001: Start Tor as part of the Fenix initialization - - - - - aec19a1b by Alex Catarineu at 2020-10-29T20:11:36+00:00 Bug 40030: Install HTTPS Everywhere and NoScript addons on startup HTTPS Everywhere is installed as a builtin extension and NoScript as a regular AMO addon. To avoid unnecessary I/O we only install NoScript the first time, and rely on the browser addon updating mechanism for keeping up with new versions. This is the same behaviour that was implemented in the Fennec-based Tor Browser, where it was installed as a "distribution addon", which also only occurred once. - - - - - 91023fbd by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 34403: Disable Normal mode by default - - - - - b5758381 by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40015: Modify Home menu - - - - - 3ad3decc by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40016: Hide unwanted Settings - - - - - 036e6b23 by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40016: Modify Default toolbar menu - - - - - 83a273b7 by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40016: Add Donate settings button - - - - - cc124409 by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40016: Move Allow Screenshots under Advanced - - - - - 1f1cfdca by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40016: Don't install WebCompat webext - - - - - 4a285ecb by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40016: Don't onboard Search Suggestions - - - - - 5d7f0089 by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40031: Hide Mozilla-specific items on About page - - - - - bef8b6a7 by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40020: Change App icons - - - - - e7018090 by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40032: Set usesCleartextTraffic as false - - - - - f34a63ce by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40028: Define bootstrapping events and Quick Start - - - - - 3c8741ff by Matthew Finkel at 2020-11-06T01:24:54+00:00 Bug 40028: Implement Tor Service controller - - - - - 34c4c74a by Matthew Finkel at 2020-11-06T17:53:53+00:00 Bug 40028: Integrate Tor Controller into HomeFragment - - - - - d5b46f5c by Matthew Finkel at 2020-11-06T17:53:53+00:00 Bug 40028: Implement Tor connect and logger screens - - - - - 0bbf01ec by Matthew Finkel at 2020-11-06T17:53:54+00:00 Bug 40028: Implement Tor Onboarding - - - - - 104f0beb by Matthew Finkel at 2020-11-06T17:53:54+00:00 Bug 40028: Implement new home screen - - - - - 73c8b588 by Matthew Finkel at 2020-11-06T17:53:55+00:00 Bug 40034: Disable PWA onboading - - - - - a6aee32a by Alexander Færøy at 2020-11-06T17:53:55+00:00 Pin CI builds to runners with 32GB of RAM to avoid OOM conditions. - - - - - 627e13c6 by Georg Koppen at 2020-11-06T17:53:56+00:00 Bug 40042: Add option do overwrite timestamp in extension version - - - - - 7f43dd12 by Alex Catarineu at 2020-11-06T17:53:56+00:00 Bug 34378: Port external helper app prompting With the corresponding android-components patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 63c189ec by Georg Koppen at 2020-11-06T17:53:57+00:00 Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. - - - - - ae46761c by Matthew Finkel at 2020-11-06T17:53:57+00:00 Bug 40041: Implement Tor Network Settings - - - - - 623c658f by Matthew Finkel at 2020-11-06T17:53:58+00:00 Bug 40041: Integrate Tor Network Settings - - - - - a0acb481 by Alex Catarineu at 2020-11-06T17:53:58+00:00 Bug 40063: Do not sort search engines alphabetically - - - - - 48bddc25 by Matthew Finkel at 2020-11-06T17:53:59+00:00 Bug 40026: Implement Security Level settings - - - - - dd0dafed by Matthew Finkel at 2020-11-06T17:53:59+00:00 Bug 40026: Integrate Security Level settings - - - - - 103c20b3 by Matthew Finkel at 2020-11-06T17:54:00+00:00 Bug 40064: Use Gecko Beta for Nightly and Debug variants - - - - - 8243b62e by Alex Catarineu at 2020-11-06T17:54:00+00:00 Bug 40061: Do not show "Send to device" in sharing menu - - - - - ec9ccd14 by Alex Catarineu at 2020-11-06T17:54:00+00:00 Bug 40058: Hide option for disallowing addon in private mode - - - - - a0e03e34 by Georg Koppen at 2020-11-06T17:54:01+00:00 Bug 40067: Fix reproducibility issue in classes2.dex We make sure our MOZ_BUILD_DATE gets used as a source for showing date related information on the Fenix about page. - - - - - f5b7c494 by Matthew Finkel at 2020-11-06T17:54:01+00:00 Bug 40072: Disable Tracking Protection - - - - - 7a4139cd by Alex Catarineu at 2020-11-06T17:54:02+00:00 Bug 40062: HTTPS Everywhere is not shown as installed Also 40070: Consider storing the list of recommended addons This implements our own AddonsProvider, which loads the list of available addons from assets instead of fetching it from an endpoint. In this list, we replace https-everywhere by our https-everywhere-eff, so that the EFF one is shown as installed in the addons list and the AMO one is not displayed. Also, we hide the uninstall button for builtin addons. - - - - - 0ef52ce1 by Georg Koppen at 2020-11-06T17:54:02+00:00 Bug 40083: Make locale ordering in BuildConfig deterministic - - - - - af675830 by Matthew Finkel at 2020-11-06T17:54:03+00:00 Bug 40071: Show only supported locales - - - - - 8a04357c by Matthew Finkel at 2020-11-06T17:54:03+00:00 Bug 40073: Use correct branding on About page - - - - - c8183bd1 by Alex Catarineu at 2020-11-06T17:54:04+00:00 Bug 40088: Use Tor Browser logo in migration screen - - - - - 1e7f1940 by Alex Catarineu at 2020-11-06T17:54:04+00:00 Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment - - - - - 8b96425f by Alex Catarineu at 2020-11-06T17:54:05+00:00 Bug 40095: Hide "Sign in to sync" in bookmarks - - - - - 73c08c2f by Alex Catarineu at 2020-11-06T17:54:05+00:00 Bug 40087: Implement a switch for english locale spoofing - - - - - 18abc197 by Matthew Finkel at 2020-11-06T17:54:09+00:00 Bug 40098 - Add EOY home screen - - - - - 30 changed files: - + .gitlab-ci.yml - LICENSE - app/build.gradle - app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt - − app/src/beta/res/drawable/ic_launcher_foreground.xml - app/src/beta/res/mipmap-hdpi/ic_launcher.png - app/src/beta/res/mipmap-mdpi/ic_launcher.png - app/src/beta/res/mipmap-xhdpi/ic_launcher.png - app/src/beta/res/mipmap-xxhdpi/ic_launcher.png - app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png - app/src/beta/res/values/static_strings.xml - app/src/beta/res/xml/shortcuts.xml - − app/src/debug/res/drawable/ic_launcher_foreground.xml - app/src/debug/res/xml/shortcuts.xml - app/src/main/AndroidManifest.xml - + app/src/main/assets/allowed_addons.json - app/src/main/java/org/mozilla/fenix/FeatureFlags.kt - app/src/main/java/org/mozilla/fenix/FenixApplication.kt - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - app/src/main/java/org/mozilla/fenix/components/Analytics.kt - app/src/main/java/org/mozilla/fenix/components/Components.kt - app/src/main/java/org/mozilla/fenix/components/Core.kt - + app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt - + app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt - app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt - app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt - app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt - app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/998e759cb552… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/998e759cb552… 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] fixup! Bug 40098 - Add EOY home screen
by Matthew Finkel 06 Nov '20

06 Nov '20

Matthew Finkel pushed to branch tor-browser-82.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: ba392006 by Matthew Finkel at 2020-11-06T17:20:59+00:00 fixup! Bug 40098 - Add EOY home screen Bug 40106: EOY November Update - Matching - - - - - 5 changed files: - LICENSE - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - + app/src/main/res/font/cousine.ttf - app/src/main/res/layout/fragment_home.xml - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== LICENSE ===================================== @@ -488,3 +488,211 @@ 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. + +=============================================================================== + +The Cousine font is licensed under the Apache License, Version 2.0. +https://fonts.google.com/specimen/Cousine + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -272,6 +272,14 @@ class HomeFragment : Fragment() { adjustHomeFragmentView(currentMode.getCurrentMode(), view) showSessionControlView(view) + view.donationmatch.setOnClickListener { + activity.openToBrowserAndLoad( + searchTermOrURL = "https://blog.torproject.org/friends-of-tor-match-2020", + newTab = true, + from = BrowserDirection.FromHome + ) + } + view.donate_now_button.setOnClickListener { val country = LocaleManager.getSelectedLocale(requireContext()).country var locale = LocaleManager.getSelectedLocale(requireContext()).language ===================================== app/src/main/res/font/cousine.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/cousine.ttf differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -124,7 +124,27 @@ android:lineSpacingMultiplier="1.1" android:text="@string/tor_resistsurveillance" android:textColor="#FFFFFFFF" - android:textSize="25sp" + android:textSize="27sp" + android:visibility="visible" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/donationmatch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="40dp" + android:layout_gravity="center_vertical" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:clickable="false" + android:focusable="false" + android:gravity="start" + android:fontFamily="@font/cousine" + android:importantForAccessibility="no" + android:lineSpacingMultiplier="1.1" + android:text="@string/tor_donationmatch" + android:textColor="#9D4AE8" + android:textSize="14sp" android:visibility="visible" app:layout_scrollFlags="scroll" /> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -75,4 +75,5 @@ <string name="tor_useamask_usetor">Use a mask, use Tor.</string> <string name="tor_resistsurveillance">Resist the surveillance pandemic.</string> + <string name="tor_donationmatch">Your donation will be matched by Friends of Tor.</string> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/ba39200610670… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/ba39200610670… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-60.0.5-10.5-1] fixup! Bug 34439: Isolate Icon loader on Android
by Matthew Finkel 06 Nov '20

06 Nov '20

Matthew Finkel pushed to branch android-components-60.0.5-10.5-1 at The Tor Project / Applications / android-components Commits: bff7eca5 by Alex Catarineu at 2020-11-06T16:40:13+00:00 fixup! Bug 34439: Isolate Icon loader on Android Fixes #40025. - - - - - 1 changed file: - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt Changes: ===================================== components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt ===================================== @@ -80,6 +80,7 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url) .addHeadersFrom(this) .addBodyFrom(this) .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD) + .origin(origin) .build() private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder { 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/android-components][android-components-63.0.1-10.5-1] 2 commits: fixup! Bug 34439: Isolate Icon loader on Android
by Matthew Finkel 06 Nov '20

06 Nov '20

Matthew Finkel pushed to branch android-components-63.0.1-10.5-1 at The Tor Project / Applications / android-components Commits: 75eefd87 by Alex Catarineu at 2020-11-06T14:59:53+01:00 fixup! Bug 34439: Isolate Icon loader on Android Fixes #40025. - - - - - 73749e43 by Matthew Finkel at 2020-11-06T16:38:41+00:00 Merge remote-tracking branch 'acatgl/40025' into android-components-63.0.1-10.5-1 - - - - - 1 changed file: - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt Changes: ===================================== components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt ===================================== @@ -80,6 +80,7 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url) .addHeadersFrom(this) .addBodyFrom(this) .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD) + .origin(origin) .build() private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder { 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-63.0.1-10.5-1] 16 commits: Bug 40005: Modify Default toolbar menu
by Georg Koppen 06 Nov '20

06 Nov '20

Georg Koppen pushed to branch android-components-63.0.1-10.5-1 at The Tor Project / Applications / android-components Commits: 83bfd541 by Matthew Finkel at 2020-11-05T01:19:56+00:00 Bug 40005: Modify Default toolbar menu - - - - - 942147de by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - e0606995 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40002: Ensure system download manager is not used - - - - - 6ab9b343 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - db5e1e29 by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40006: Expose Security Level interface - - - - - 92cfdeed by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40011: Hide option for disallowing addons in private mode - - - - - 2a46dd3d by Georg Koppen at 2020-11-05T01:19:58+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 3b8dc42e by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40015: Port padlock states for .onion services - - - - - 2b8a07d2 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - b7928400 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - 811907fe by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - aa06dcfc by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40020: Disable third-party cookies - - - - - ea650f06 by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40023: Stop PrivateNotificationService - - - - - bfffb3ae by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40024: Disable tracking protection by default - - - - - 0cb868ce by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40019: Expose spoofEnglish pref - - - - - 9ad318b2 by Alex Catarineu at 2020-11-05T01:30:18+00:00 Bug 34439: Isolate Icon loader on Android - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenu.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - + components/browser/search/src/main/assets/searchplugins/youtube.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt The diff was not included because it is too large. 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-63.0.1-10.0-1] 15 commits: Bug 40005: Modify Default toolbar menu
by Georg Koppen 06 Nov '20

06 Nov '20

Georg Koppen pushed to branch android-components-63.0.1-10.0-1 at The Tor Project / Applications / android-components Commits: 83bfd541 by Matthew Finkel at 2020-11-05T01:19:56+00:00 Bug 40005: Modify Default toolbar menu - - - - - 942147de by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - e0606995 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40002: Ensure system download manager is not used - - - - - 6ab9b343 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - db5e1e29 by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40006: Expose Security Level interface - - - - - 92cfdeed by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40011: Hide option for disallowing addons in private mode - - - - - 2a46dd3d by Georg Koppen at 2020-11-05T01:19:58+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 3b8dc42e by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40015: Port padlock states for .onion services - - - - - 2b8a07d2 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - b7928400 by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - 811907fe by Alex Catarineu at 2020-11-05T01:19:58+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - aa06dcfc by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40020: Disable third-party cookies - - - - - ea650f06 by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40023: Stop PrivateNotificationService - - - - - bfffb3ae by Matthew Finkel at 2020-11-05T01:19:58+00:00 Bug 40024: Disable tracking protection by default - - - - - 5112e324 by Alex Catarineu at 2020-11-05T01:32:13+00:00 Bug 40019: Expose spoofEnglish pref - - - - - 30 changed files: - build.gradle - 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/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenu.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - + components/browser/search/src/main/assets/searchplugins/youtube.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt - components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt - components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.kt The diff was not included because it is too large. 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

[tor-browser/tor-browser-83.0b1-10.0-1] Revert "Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware"
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit d5a27eba08000d62b712149ed5809f91f1eb8ab6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Nov 5 01:52:53 2020 +0000 Revert "Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware" This reverts commit 49685688c006f3050f64c091563eded4466ef9ad. --- .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ------------------ widget/android/WebExecutorSupport.cpp | 10 ---------- 2 files changed, 28 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java index 18f56abeec43..7e3aa285c5be 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java @@ -49,11 +49,6 @@ public class WebRequest extends WebMessage { */ public final @Nullable String referrer; - /** - * The value of the origin of this request. - */ - public final @Nullable String origin; - @Retention(RetentionPolicy.SOURCE) @IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE, CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE, @@ -115,7 +110,6 @@ public class WebRequest extends WebMessage { method = builder.mMethod; cacheMode = builder.mCacheMode; referrer = builder.mReferrer; - origin = builder.mOrigin; if (builder.mBody != null) { body = builder.mBody.asReadOnlyBuffer(); @@ -132,7 +126,6 @@ public class WebRequest extends WebMessage { /* package */ String mMethod = "GET"; /* package */ int mCacheMode = CACHE_MODE_DEFAULT; /* package */ String mReferrer; - /* package */ String mOrigin; /** * Construct a Builder instance with the specified URI. @@ -212,17 +205,6 @@ public class WebRequest extends WebMessage { return this; } - /** - * Set the origin URI. - * - * @param origin A URI String - * @return This Builder instance. - */ - public @NonNull Builder origin(final @Nullable String origin) { - mOrigin = origin; - return this; - } - /** * @return A {@link WebRequest} constructed with the values from this Builder instance. */ diff --git a/widget/android/WebExecutorSupport.cpp b/widget/android/WebExecutorSupport.cpp index bb639740f013..f9f4262fb50c 100644 --- a/widget/android/WebExecutorSupport.cpp +++ b/widget/android/WebExecutorSupport.cpp @@ -390,16 +390,6 @@ nsresult WebExecutorSupport::CreateStreamLoader( MOZ_ASSERT(cookieJarSettings); nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo(); - - RefPtr<nsIURI> originUri; - const auto origin = req->Origin(); - if (origin) { - rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString()); - NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI); - OriginAttributes attrs = loadInfo->GetOriginAttributes(); - attrs.SetFirstPartyDomain(true, originUri); - loadInfo->SetOriginAttributes(attrs); - } loadInfo->SetCookieJarSettings(cookieJarSettings); // setup http/https specific things

1 0

[Git][tpo/applications/android-components][android-components-60.0.5-10.0-1] Revert "Merge remote-tracking branch 'acatgl/34439' into android-components-60.0.5-10.0-1"
by Matthew Finkel 04 Nov '20

04 Nov '20

Matthew Finkel pushed to branch android-components-60.0.5-10.0-1 at The Tor Project / Applications / android-components Commits: f66e0b39 by Matthew Finkel at 2020-11-05T01:39:20+00:00 Revert "Merge remote-tracking branch 'acatgl/34439' into android-components-60.0.5-10.0-1" This reverts commit 8dff84319a18189e6b4bcca5ce78beed9aba984b, reversing changes made to c2d4d9840a0f8e789e091bc693d01f2995fb5fc5. - - - - - 3 changed files: - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt Changes: ===================================== components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt ===================================== @@ -80,7 +80,6 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url) .addHeadersFrom(this) .addBodyFrom(this) .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD) - .origin(origin) .build() private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder { ===================================== components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt ===================================== @@ -51,8 +51,7 @@ class HttpIconLoader( connectTimeout = Pair(CONNECT_TIMEOUT, TimeUnit.SECONDS), readTimeout = Pair(READ_TIMEOUT, TimeUnit.SECONDS), redirect = Request.Redirect.FOLLOW, - useCaches = true, - origin = request.url) + useCaches = true) return try { val response = httpClient.fetch(downloadRequest) ===================================== components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt ===================================== @@ -46,8 +46,7 @@ data class Request( val body: Body? = null, val redirect: Redirect = Redirect.FOLLOW, val cookiePolicy: CookiePolicy = CookiePolicy.INCLUDE, - val useCaches: Boolean = true, - val origin: String? = null + val useCaches: Boolean = true ) { /** * A [Body] to be send with the [Request]. 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/android-components] Pushed new branch android-components-60.0.5-10.5-1
by Matthew Finkel 04 Nov '20

04 Nov '20

Matthew Finkel pushed new branch android-components-60.0.5-10.5-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/android-components] Pushed new branch android-components-63.0.1-10.5-1
by Matthew Finkel 04 Nov '20

04 Nov '20

Matthew Finkel pushed new branch android-components-63.0.1-10.5-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/android-components] Pushed new branch android-components-63.0.1-10.0-1
by Matthew Finkel 04 Nov '20

04 Nov '20

Matthew Finkel pushed new branch android-components-63.0.1-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

[tor-browser/tor-browser-83.0b1-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 3e7aa3bb2ceac256a2ad55938dc5b2dad028dbc2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Nov 5 00:42:48 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 65b6f322d5cf..b0739b02caac 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 65b6f322d5cf0b0bce51228ee0af8ee48384d5cc +Subproject commit b0739b02caacea311d54192d22005aaa88505b11

1 0

[tor-browser/tor-browser-83.0b1-10.0-1] Merge remote-tracking branch 'acatgl/40206' into tor-browser-83.0b1-10.0-1
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 1092ec6dd4abc593a7ab2d1d71e5ab8f639a8654 Merge: 49685688c006 6e9dc7442f46 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 4 21:57:02 2020 +0000 Merge remote-tracking branch 'acatgl/40206' into tor-browser-83.0b1-10.0-1 browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-83.0b1-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 6e9dc7442f467104029d2f72d8fa8910a4b22561 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 29 23:03:57 2020 +0100 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40206: Disable the /etc/hosts parser --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8bd05987c681..19991a801fcd 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -135,6 +135,9 @@ pref("trailhead.firstrun.branches", ""); // Clear the list of trusted recursive resolver services pref("network.trr.resolvers", ""); +// Disable the /etc/hosts parser +pref("network.trr.exclude-etc-hosts", false); + // Disable crlite pref("security.pki.crlite_mode", 0);

1 0

[Git][tpo/applications/android-components][android-components-60.0.5-10.0-1] 2 commits: Bug 34439: Isolate Icon loader on Android
by Matthew Finkel 04 Nov '20

04 Nov '20

Matthew Finkel pushed to branch android-components-60.0.5-10.0-1 at The Tor Project / Applications / android-components Commits: 698c81b9 by Alex Catarineu at 2020-11-04T15:51:00+01:00 Bug 34439: Isolate Icon loader on Android - - - - - 8dff8431 by Matthew Finkel at 2020-11-04T21:55:08+00:00 Merge remote-tracking branch 'acatgl/34439' into android-components-60.0.5-10.0-1 - - - - - 3 changed files: - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt Changes: ===================================== components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt ===================================== @@ -80,6 +80,7 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url) .addHeadersFrom(this) .addBodyFrom(this) .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD) + .origin(origin) .build() private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder { ===================================== components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt ===================================== @@ -51,7 +51,8 @@ class HttpIconLoader( connectTimeout = Pair(CONNECT_TIMEOUT, TimeUnit.SECONDS), readTimeout = Pair(READ_TIMEOUT, TimeUnit.SECONDS), redirect = Request.Redirect.FOLLOW, - useCaches = true) + useCaches = true, + origin = request.url) return try { val response = httpClient.fetch(downloadRequest) ===================================== components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt ===================================== @@ -46,7 +46,8 @@ data class Request( val body: Body? = null, val redirect: Redirect = Redirect.FOLLOW, val cookiePolicy: CookiePolicy = CookiePolicy.INCLUDE, - val useCaches: Boolean = true + val useCaches: Boolean = true, + val origin: String? = null ) { /** * A [Body] to be send with the [Request]. 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

[tor-browser/tor-browser-83.0b1-10.0-1] Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 49685688c006f3050f64c091563eded4466ef9ad Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 15:58:22 2020 +0100 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware --- .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ++++++++++++++++++ widget/android/WebExecutorSupport.cpp | 10 ++++++++++ 2 files changed, 28 insertions(+) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java index 7e3aa285c5be..18f56abeec43 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java @@ -49,6 +49,11 @@ public class WebRequest extends WebMessage { */ public final @Nullable String referrer; + /** + * The value of the origin of this request. + */ + public final @Nullable String origin; + @Retention(RetentionPolicy.SOURCE) @IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE, CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE, @@ -110,6 +115,7 @@ public class WebRequest extends WebMessage { method = builder.mMethod; cacheMode = builder.mCacheMode; referrer = builder.mReferrer; + origin = builder.mOrigin; if (builder.mBody != null) { body = builder.mBody.asReadOnlyBuffer(); @@ -126,6 +132,7 @@ public class WebRequest extends WebMessage { /* package */ String mMethod = "GET"; /* package */ int mCacheMode = CACHE_MODE_DEFAULT; /* package */ String mReferrer; + /* package */ String mOrigin; /** * Construct a Builder instance with the specified URI. @@ -205,6 +212,17 @@ public class WebRequest extends WebMessage { return this; } + /** + * Set the origin URI. + * + * @param origin A URI String + * @return This Builder instance. + */ + public @NonNull Builder origin(final @Nullable String origin) { + mOrigin = origin; + return this; + } + /** * @return A {@link WebRequest} constructed with the values from this Builder instance. */ diff --git a/widget/android/WebExecutorSupport.cpp b/widget/android/WebExecutorSupport.cpp index f9f4262fb50c..bb639740f013 100644 --- a/widget/android/WebExecutorSupport.cpp +++ b/widget/android/WebExecutorSupport.cpp @@ -390,6 +390,16 @@ nsresult WebExecutorSupport::CreateStreamLoader( MOZ_ASSERT(cookieJarSettings); nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo(); + + RefPtr<nsIURI> originUri; + const auto origin = req->Origin(); + if (origin) { + rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString()); + NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI); + OriginAttributes attrs = loadInfo->GetOriginAttributes(); + attrs.SetFirstPartyDomain(true, originUri); + loadInfo->SetOriginAttributes(attrs); + } loadInfo->SetCookieJarSettings(cookieJarSettings); // setup http/https specific things

1 0

[tor-browser/tor-browser-82.0-10.0-1] Merge remote-tracking branch 'acatgl/40171' into tor-browser-82.0-10.0-1
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit fb38615ac2ab7345dffba2b3ecef110ba47fba7c Merge: 9f748e44a9d2 9d609e98a6ea Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 4 21:40:47 2020 +0000 Merge remote-tracking branch 'acatgl/40171' into tor-browser-82.0-10.0-1 .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ++++++++++++++++++ widget/android/WebExecutorSupport.cpp | 10 ++++++++++ 2 files changed, 28 insertions(+)

1 0

[tor-browser/tor-browser-82.0-10.0-1] Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 9d609e98a6ea20a3a4f01c86ee3a53a2a7f33f47 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 15:58:22 2020 +0100 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware --- .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ++++++++++++++++++ widget/android/WebExecutorSupport.cpp | 10 ++++++++++ 2 files changed, 28 insertions(+) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java index 7e3aa285c5be..18f56abeec43 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java @@ -49,6 +49,11 @@ public class WebRequest extends WebMessage { */ public final @Nullable String referrer; + /** + * The value of the origin of this request. + */ + public final @Nullable String origin; + @Retention(RetentionPolicy.SOURCE) @IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE, CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE, @@ -110,6 +115,7 @@ public class WebRequest extends WebMessage { method = builder.mMethod; cacheMode = builder.mCacheMode; referrer = builder.mReferrer; + origin = builder.mOrigin; if (builder.mBody != null) { body = builder.mBody.asReadOnlyBuffer(); @@ -126,6 +132,7 @@ public class WebRequest extends WebMessage { /* package */ String mMethod = "GET"; /* package */ int mCacheMode = CACHE_MODE_DEFAULT; /* package */ String mReferrer; + /* package */ String mOrigin; /** * Construct a Builder instance with the specified URI. @@ -205,6 +212,17 @@ public class WebRequest extends WebMessage { return this; } + /** + * Set the origin URI. + * + * @param origin A URI String + * @return This Builder instance. + */ + public @NonNull Builder origin(final @Nullable String origin) { + mOrigin = origin; + return this; + } + /** * @return A {@link WebRequest} constructed with the values from this Builder instance. */ diff --git a/widget/android/WebExecutorSupport.cpp b/widget/android/WebExecutorSupport.cpp index dc428e34c10c..60ab02c03354 100644 --- a/widget/android/WebExecutorSupport.cpp +++ b/widget/android/WebExecutorSupport.cpp @@ -383,6 +383,16 @@ nsresult WebExecutorSupport::CreateStreamLoader( MOZ_ASSERT(cookieJarSettings); nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo(); + + RefPtr<nsIURI> originUri; + const auto origin = req->Origin(); + if (origin) { + rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString()); + NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI); + OriginAttributes attrs = loadInfo->GetOriginAttributes(); + attrs.SetFirstPartyDomain(true, originUri); + loadInfo->SetOriginAttributes(attrs); + } loadInfo->SetCookieJarSettings(cookieJarSettings); // setup http/https specific things

1 0