- tbb-commits - lists.torproject.org

[tor-browser-build/maint-10.0] Pick up tor-browser -build4
by gk＠torproject.org 11 Oct '20

11 Oct '20

commit 0ed3fcfc32acb88d1f7f98c26c91db90d305e481 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 11 09:28:46 2020 +0000 Pick up tor-browser -build4 --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 8c73b0d..8db58d5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build4' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 8ece479..0530620 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0.1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.0 project_name: tor-browser

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-2] fixup! squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 11 Oct '20

11 Oct '20

commit c99864079708fa7d937b479b0f926dc1e489f0fa Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 11 09:25:01 2020 +0000 fixup! squash! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e1e79f15a5ea..6bc759bdf30b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -354,7 +354,7 @@ pref("corroborator.enabled", false); // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1667360 and // tor-browser#40140. #ifdef XP_WIN -pref"media.rdd-opus.enabled", false); +pref("media.rdd-opus.enabled", false); #endif // Onboarding.

1 0

[tor-browser-build/maint-10.0] Bug 40051: Remove SOURCE_DATE_EPOCH patch
by sysrqb＠torproject.org 10 Oct '20

10 Oct '20

commit b587acfc0ab9f08fed9ed158a282b384add54212 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 9 15:21:32 2020 +0000 Bug 40051: Remove SOURCE_DATE_EPOCH patch --- projects/openssl/build | 3 --- projects/openssl/config | 2 -- projects/openssl/use-SOURCE_DATE_EPOCH.patch | 25 ---------------------- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 4 files changed, 2 insertions(+), 30 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 63ea178..f8c4cbf 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -13,9 +13,6 @@ export CC='gcc -m32' ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] -[% IF c("var/windows") -%] - patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch -[% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] make diff --git a/projects/openssl/config b/projects/openssl/config index 8ed29db..45b4fd6 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -31,6 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - - filename: use-SOURCE_DATE_EPOCH.patch - enable: '[% c("var/windows") %]' sha256sum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 diff --git a/projects/openssl/use-SOURCE_DATE_EPOCH.patch b/projects/openssl/use-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index 65533bb..0000000 --- a/projects/openssl/use-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a1625535fc5127ab8e94043280ef7a983bcfc161 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Thu, 5 Mar 2020 20:39:05 +0100 -Subject: [PATCH] If SOURCE_DATE_EPOCH is defined, use it for copyright year - -Using the date from SOURCE_DATE_EPOCH instead of the current date makes -it possible to reproduce a build that was built on a different year: -https://reproducible-builds.org/specs/source-date-epoch/ ---- - util/mkrc.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/mkrc.pl b/util/mkrc.pl -index 6762bc4a56..e15c071af7 100755 ---- a/util/mkrc.pl -+++ b/util/mkrc.pl -@@ -46,7 +46,7 @@ if ( $filename =~ /openssl/i ) { - $vft = "VFT_APP"; - } - --my $YEAR = [localtime()]->[5] + 1900; -+my $YEAR = [localtime($ENV{SOURCE_DATE_EPOCH} || time())]->[5] + 1900; - print <<___; - #include <winver.h> - diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 8d3cdb9..2bf6fb5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -14,6 +14,8 @@ Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux * Bump Go to 1.14.9 * Bump openssl to 1.1.1h + * Windows + * Bug 40051: Remove SOURCE_DATE_EPOCH patch Tor Browser 10.0 -- September 22 2020 * Windows + OS X + Linux

1 0

[tor-browser-build/maint-10.0] Tor Browser 10.0.1 release preparations
by sysrqb＠torproject.org 10 Oct '20

10 Oct '20

commit 822525f34a96ed175071197c8bd0e7b997650074 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 9 03:02:19 2020 +0000 Tor Browser 10.0.1 release preparations Version bumps and Changelog update --- projects/firefox/config | 2 +- projects/go/config | 4 ++-- projects/openssl/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- rbm.conf | 6 +++--- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 189b02e..8c73b0d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/go/config b/projects/go/config index 24ab09a..02525e7 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.14.7 +version: 1.14.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 064392433563660c73186991c0a315787688e7c38a561e26647686f89b6c30e3 + sha256sum: c687c848cc09bcabf2b5e534c3fc4259abebbfc9014dd05a1a2dc6106f404554 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/openssl/config b/projects/openssl/config index 91b0f1c..8ed29db 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1g +version: 1.1.1h filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,6 +31,6 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 - filename: use-SOURCE_DATE_EPOCH.patch enable: '[% c("var/windows") %]' + sha256sum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ce725b3..8d3cdb9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser 10.0.1 -- October 13 2020 + * Windows + OS X + Linux + * Update NoScript to 11.1.1 + * Update Tor Launcher to 0.2.26 + * Bug 31767: Avoid using intl.locale.requested pref directly + * Bug 40013: End of year 2020 Fundraising campaign [torbutton] + * Bug 40016: Fix onion pattern for LTR locales [torbutton] + * Bug 40139: Update Onboarding icon for 10.0 [tor-browser] + * Bug 40148: Disable Picture-in-Picture until we investigate and possibly fix it [tor-browser] + * Translations update + * Windows + * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows + * Build System + * Windows + OS X + Linux + * Bump Go to 1.14.9 + * Bump openssl to 1.1.1h + Tor Browser 10.0 -- September 22 2020 * Windows + OS X + Linux * Update Firefox to 78.3.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 8bb1a67..e9a17d5 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -77,9 +77,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 3b768fa45f94bed9c58962bd7c0c11bc431e639aeedb2e91c7d8303df5fc84ae + sha256sum: bdc99f11a75ea050934b692c8717c363493d5f717397ba9ef35b1a2e9078516c - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index f8828db..0c9698a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.25 +version: 0.2.26 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index c1332dd..8ece479 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0' - torbrowser_build: 'build3' + torbrowser_version: '10.0.1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5.4 + - 10.0 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 10 Oct '20

10 Oct '20

commit bc9d508fdd0f600d762544662f007c213e33ea33 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Oct 10 15:30:11 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 88640a08733b..dd24967b1bb8 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 88640a08733bd28d359e2327ecc813391ca7f705 +Subproject commit dd24967b1bb89e83b656a22ff887eff81946be45

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by sysrqb＠torproject.org 10 Oct '20

10 Oct '20

commit f24fbd15e83a3ffe0b13f2c7a23553b8fb0c839e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 9 07:19:56 2020 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40140: Videos stop working with Tor Browser 10.0 on Windows --- browser/app/profile/000-tor-browser.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bac98ce06540..0851f9ac84de 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -347,6 +347,13 @@ pref("browser.urlbar.update1.searchTips", false); // is only reported via telemetry (which is disabled). pref("corroborator.enabled", false); +// Having the RDD Opus option enabled on Windows breaks videos for us. +// See: https://bugzilla.mozilla.org/show_bug.cgi?id=1667360 and +// tor-browser#40140. +#ifdef XP_WIN +pref"media.rdd-opus.enabled", false); +#endif + // Onboarding. pref("browser.onboarding.tourset-version", 5); pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services,learn-more");

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-1] fixup! Bug 26961: New user onboarding.
by sysrqb＠torproject.org 10 Oct '20

10 Oct '20

commit ed0d4de53aeb4c4c328e84b1c2621bbaf475824e Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 8 11:51:44 2020 +0200 fixup! Bug 26961: New user onboarding. Bug 40139: Update Onboarding icon for 10.0 --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index b411a3039a3e..9f51fb4bd28a 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -909,7 +909,7 @@ class Onboarding { } const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo - const kLearnMore = "https://www.torproject.org/releases/tor-browser-95/"; + const kLearnMore = "https://www.torproject.org/releases/tor-browser-10-0/"; let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button-icon":

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 10 Oct '20

10 Oct '20

commit 20c8589c0570f6408c742e0f3b67f39907431267 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Oct 10 15:16:18 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 4e67ee2ef26e..dd24967b1bb8 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 4e67ee2ef26e28da0f02a0e43e22a61ee33c6d4d +Subproject commit dd24967b1bb89e83b656a22ff887eff81946be45

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] Bug 40062: HTTPS Everywhere is not shown as installed
by Matthew Finkel 10 Oct '20

10 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 1e797f95 by Alex Catarineu at 2020-10-10T14:15:25+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. - - - - - 4 changed files: - + app/src/main/assets/allowed_addons.json - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - app/src/main/java/org/mozilla/fenix/components/Components.kt - + app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt Changes: ===================================== app/src/main/assets/allowed_addons.json ===================================== The diff for this file was not included because it is too large. ===================================== app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt ===================================== @@ -21,6 +21,7 @@ import kotlinx.coroutines.launch import mozilla.components.feature.addons.Addon import mozilla.components.feature.addons.AddonManagerException import mozilla.components.feature.addons.ui.translatedName +import mozilla.components.support.webextensions.WebExtensionSupport.installedExtensions import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.ext.components @@ -256,6 +257,8 @@ class InstalledAddonDetailsFragment : Fragment() { } } private fun bindRemoveButton(view: View) { + val isBuiltin = installedExtensions[addon.id]?.isBuiltIn() ?: false + view.remove_add_on.isVisible = !isBuiltin view.remove_add_on.setOnClickListener { setAllInteractiveViewsClickable(view, false) requireContext().components.addonManager.uninstallAddon( ===================================== app/src/main/java/org/mozilla/fenix/components/Components.kt ===================================== @@ -9,7 +9,6 @@ import android.content.Context import android.content.Intent import androidx.core.net.toUri import mozilla.components.feature.addons.AddonManager -import mozilla.components.feature.addons.amo.AddonCollectionProvider import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker import mozilla.components.feature.addons.migration.SupportedAddonsChecker import mozilla.components.feature.addons.update.AddonUpdater @@ -71,18 +70,7 @@ class Components(private val context: Context) { ) } - val addonCollectionProvider by lazy { - if (!BuildConfig.AMO_COLLECTION.isNullOrEmpty()) { - AddonCollectionProvider( - context, - core.client, - collectionName = BuildConfig.AMO_COLLECTION, - maxCacheAgeInMinutes = DAY_IN_MINUTES - ) - } else { - AddonCollectionProvider(context, core.client, maxCacheAgeInMinutes = DAY_IN_MINUTES) - } - } + val addonCollectionProvider by lazy { TorAddonCollectionProvider(context, core.client) } val appStartupTelemetry by lazy { AppStartupTelemetry(analytics.metrics) } ===================================== app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt ===================================== @@ -0,0 +1,60 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// Copyright (c) 2020, The Tor Project, Inc. + +package org.mozilla.fenix.components + +import android.content.Context +import android.graphics.Bitmap +import kotlinx.coroutines.withContext +import mozilla.components.concept.fetch.Client +import mozilla.components.feature.addons.Addon +import kotlinx.coroutines.Dispatchers +import mozilla.components.feature.addons.amo.AddonCollectionProvider +import java.io.IOException + +internal const val COLLECTION_NAME = "tor_browser_collection" +internal const val ALLOWED_ADDONS_PATH = "allowed_addons.json" +internal const val MAX_CACHE_AGE = 1000L * 365L * 24L * 60L // 1000 years + +class TorAddonCollectionProvider( + private val context: Context, + client: Client +) : AddonCollectionProvider( + context, client, serverURL = "", + collectionName = COLLECTION_NAME, + maxCacheAgeInMinutes = MAX_CACHE_AGE +) { + private var isCacheLoaded = false + + @Throws(IOException::class) + override suspend fun getAvailableAddons( + allowCache: Boolean, + readTimeoutInSeconds: Long? + ): List<Addon> { + ensureCache() + return super.getAvailableAddons(true, readTimeoutInSeconds) + } + + @Throws(IOException::class) + override suspend fun getAddonIconBitmap(addon: Addon): Bitmap? { + ensureCache() + return super.getAddonIconBitmap(addon) + } + + @Throws(IOException::class) + private suspend fun ensureCache() { + if (isCacheLoaded) { + return + } + return withContext(Dispatchers.IO) { + val data = context.assets.open(ALLOWED_ADDONS_PATH).bufferedReader().use { + it.readText() + } + writeToDiskCache(data) + isCacheLoaded = true + } + } +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/1e797f9532bee… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/1e797f9532bee… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.2-10.0-2] 2 commits: Bug 40062: HTTPS Everywhere is not shown as installed
by Matthew Finkel 10 Oct '20

10 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.2-10.0-2 at The Tor Project / Applications / fenix Commits: 78d91855 by Alex Catarineu at 2020-10-08T20:47:52+02: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. - - - - - b0726c30 by Matthew Finkel at 2020-10-10T14:14:42+00:00 Merge remote-tracking branch 'acatgl/40062+1' into tor-browser-81.1.2-10.0-2 - - - - - 4 changed files: - + app/src/main/assets/allowed_addons.json - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - app/src/main/java/org/mozilla/fenix/components/Components.kt - + app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt Changes: ===================================== app/src/main/assets/allowed_addons.json ===================================== The diff for this file was not included because it is too large. ===================================== app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt ===================================== @@ -21,6 +21,7 @@ import kotlinx.coroutines.launch import mozilla.components.feature.addons.Addon import mozilla.components.feature.addons.AddonManagerException import mozilla.components.feature.addons.ui.translatedName +import mozilla.components.support.webextensions.WebExtensionSupport.installedExtensions import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.ext.components @@ -256,6 +257,8 @@ class InstalledAddonDetailsFragment : Fragment() { } } private fun bindRemoveButton(view: View) { + val isBuiltin = installedExtensions[addon.id]?.isBuiltIn() ?: false + view.remove_add_on.isVisible = !isBuiltin view.remove_add_on.setOnClickListener { setAllInteractiveViewsClickable(view, false) requireContext().components.addonManager.uninstallAddon( ===================================== app/src/main/java/org/mozilla/fenix/components/Components.kt ===================================== @@ -9,7 +9,6 @@ import android.content.Context import android.content.Intent import androidx.core.net.toUri import mozilla.components.feature.addons.AddonManager -import mozilla.components.feature.addons.amo.AddonCollectionProvider import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker import mozilla.components.feature.addons.migration.SupportedAddonsChecker import mozilla.components.feature.addons.update.AddonUpdater @@ -71,18 +70,7 @@ class Components(private val context: Context) { ) } - val addonCollectionProvider by lazy { - if (!BuildConfig.AMO_COLLECTION.isNullOrEmpty()) { - AddonCollectionProvider( - context, - core.client, - collectionName = BuildConfig.AMO_COLLECTION, - maxCacheAgeInMinutes = DAY_IN_MINUTES - ) - } else { - AddonCollectionProvider(context, core.client, maxCacheAgeInMinutes = DAY_IN_MINUTES) - } - } + val addonCollectionProvider by lazy { TorAddonCollectionProvider(context, core.client) } val appStartupTelemetry by lazy { AppStartupTelemetry(analytics.metrics) } ===================================== app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt ===================================== @@ -0,0 +1,60 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// Copyright (c) 2020, The Tor Project, Inc. + +package org.mozilla.fenix.components + +import android.content.Context +import android.graphics.Bitmap +import kotlinx.coroutines.withContext +import mozilla.components.concept.fetch.Client +import mozilla.components.feature.addons.Addon +import kotlinx.coroutines.Dispatchers +import mozilla.components.feature.addons.amo.AddonCollectionProvider +import java.io.IOException + +internal const val COLLECTION_NAME = "tor_browser_collection" +internal const val ALLOWED_ADDONS_PATH = "allowed_addons.json" +internal const val MAX_CACHE_AGE = 1000L * 365L * 24L * 60L // 1000 years + +class TorAddonCollectionProvider( + private val context: Context, + client: Client +) : AddonCollectionProvider( + context, client, serverURL = "", + collectionName = COLLECTION_NAME, + maxCacheAgeInMinutes = MAX_CACHE_AGE +) { + private var isCacheLoaded = false + + @Throws(IOException::class) + override suspend fun getAvailableAddons( + allowCache: Boolean, + readTimeoutInSeconds: Long? + ): List<Addon> { + ensureCache() + return super.getAvailableAddons(true, readTimeoutInSeconds) + } + + @Throws(IOException::class) + override suspend fun getAddonIconBitmap(addon: Addon): Bitmap? { + ensureCache() + return super.getAddonIconBitmap(addon) + } + + @Throws(IOException::class) + private suspend fun ensureCache() { + if (isCacheLoaded) { + return + } + return withContext(Dispatchers.IO) { + val data = context.assets.open(ALLOWED_ADDONS_PATH).bufferedReader().use { + it.readText() + } + writeToDiskCache(data) + isCacheLoaded = true + } + } +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/6afc782a6377… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/6afc782a6377… You're receiving this email because of your account on gitlab.torproject.org.

1 0