tbb-commits June 2024

tbb-commits@lists.torproject.org

1 participants
105 discussions

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Modify add-on support
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 9020793e by Pier Angelo Vendrame at 2024-06-10T16:02:49+02:00 fixup! Modify add-on support Bug 42619: Remove our custom AddonCollectionProvider. Our own custom list of allowed addons will get outdate very soon, breaking the installation of addons from AMO, and maybe preventing the update of the ones already installed. However, the AMO collection might not be available until the boostrap is done in some conditions (when it has never been cached, or if the cache expired) and in these cases the installed addons will not be displayed either. - - - - - 3 changed files: - − fenix/app/src/main/assets/allowed_addons.json - fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt - − fenix/app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt Changes: ===================================== fenix/app/src/main/assets/allowed_addons.json deleted ===================================== The diff for this file was not included because it is too large. ===================================== fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt ===================================== @@ -12,6 +12,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.core.app.NotificationManagerCompat import com.google.android.play.core.review.ReviewManagerFactory 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.update.DefaultAddonUpdater import mozilla.components.feature.autofill.AutofillConfiguration @@ -113,7 +114,32 @@ class Components(private val context: Context) { } val addonCollectionProvider by lazyMonitored { - TorAddonCollectionProvider(context, core.client) + // Check if we have a customized (overridden) AMO collection (supported in Nightly & Beta) + if (FeatureFlags.customExtensionCollectionFeature && context.settings().amoCollectionOverrideConfigured()) { + AddonCollectionProvider( + context, + core.client, + collectionUser = context.settings().overrideAmoUser, + collectionName = context.settings().overrideAmoCollection, + ) + } + // Use build config otherwise + else if (!BuildConfig.AMO_COLLECTION_USER.isNullOrEmpty() && + !BuildConfig.AMO_COLLECTION_NAME.isNullOrEmpty() + ) { + AddonCollectionProvider( + context, + core.client, + serverURL = BuildConfig.AMO_SERVER_URL, + collectionUser = BuildConfig.AMO_COLLECTION_USER, + collectionName = BuildConfig.AMO_COLLECTION_NAME, + maxCacheAgeInMinutes = AMO_COLLECTION_MAX_CACHE_AGE, + ) + } + // Fall back to defaults + else { + AddonCollectionProvider(context, core.client, maxCacheAgeInMinutes = AMO_COLLECTION_MAX_CACHE_AGE) + } } @Suppress("MagicNumber") ===================================== fenix/app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt deleted ===================================== @@ -1,64 +0,0 @@ -/* 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?, - language: String? - ): List<Addon> { - ensureCache(language) - return super.getAvailableAddons(true, readTimeoutInSeconds, language) - } - - @Throws(IOException::class) - override suspend fun getAddonIconBitmap(addon: Addon): Bitmap? { - // super.getAddonIconBitmap does not look at the cache, so calling - // ensureCache here is not helpful. In addition, now the cache depends - // on a language, and that isn't available right now. - // ensureCache(language) - return super.getAddonIconBitmap(addon) - } - - @Throws(IOException::class) - private suspend fun ensureCache(language: String?) { - if (isCacheLoaded) { - return - } - return withContext(Dispatchers.IO) { - val data = context.assets.open(ALLOWED_ADDONS_PATH).bufferedReader().use { - it.readText() - } - writeToDiskCache(data, language) - isCacheLoaded = true - } - } -} View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/902… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/902… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41161: Explicitly fetch tags in the relprep script.
by richard (＠richard) 10 Jun '24

10 Jun '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: eb369108 by Pier Angelo Vendrame at 2024-06-10T09:18:42+02:00 Bug 41161: Explicitly fetch tags in the relprep script. This should make sure the script always bumps the build number in rbm.conf if needed. - - - - - 1 changed file: - tools/relprep.py Changes: ===================================== tools/relprep.py ===================================== @@ -158,6 +158,7 @@ class ReleasePreparation: if remote is None: raise RuntimeError("Cannot find the tpo/applications remote.") remote.fetch() + remote.fetch(tags=True) branch_name = ( "main" if self.version.is_alpha else f"maint-{self.version.major}" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.5a9-build2
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed new tag mb-13.5a9-build2 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5a9-build2
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed new tag tbb-13.5a9-build2 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41146, 41147: Bump build tag.
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 35004b06 by Pier Angelo Vendrame at 2024-06-10T09:01:17+02:00 Bug 41146,41147: Bump build tag. - - - - - 1 changed file: - rbm.conf Changes: ===================================== rbm.conf ===================================== @@ -74,7 +74,7 @@ buildconf: var: torbrowser_version: '13.5a9' - torbrowser_build: 'build1' + torbrowser_build: 'build2' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. browser_release_date: '2024/06/10 06:30:00' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41146, 41147: Updated translations and tor for 13.5a9build2.
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8467a698 by Pier Angelo Vendrame at 2024-06-10T08:56:54+02:00 Bug 41146,41147: Updated translations and tor for 13.5a9build2. - - - - - 6 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/tor/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,4 +1,4 @@ -Mullvad Browser 13.5a9 - June 07 2024 +Mullvad Browser 13.5a9 - June 10 2024 * All Platforms * Updated Firefox to 115.12.0esr * Updated uBlock Origin to 1.58.0 ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,5 +1,6 @@ -Tor Browser 13.5a9 - June 07 2024 +Tor Browser 13.5a9 - June 10 2024 * All Platforms + * Updated Tor to 0.4.8.12 * Updated OpenSSL to 3.0.14 * Bug 41467: compat: beacon: re-enable the API but transform it to a no-op [tor-browser] * Bug 42604: Add some debug logs about circuits [tor-browser] ===================================== projects/browser/allowed_addons.json ===================================== Binary files a/projects/browser/allowed_addons.json and b/projects/browser/allowed_addons.json differ ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.11 +version: 0.4.8.12 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== projects/translation/config ===================================== @@ -12,19 +12,19 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 0fa2e3c3041cfd6730edbd09ecba4926840cbf45 + git_hash: a2c920966678dd664e98318557ef03ab22023880 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 5a548c5a3c8de50182cebb560901792a9513f37b + git_hash: 0542de960c53726fab59918eeaddb3173dbacea2 targets: nightly: git_hash: 'tor-browser' mullvad-browser: mullvad-browser: '[% INCLUDE build %]' - git_hash: c5361cb496ae7e047fd9226139537f1fcfc7938d + git_hash: bff8092bbe5ae93b2c162ade300d739b2cd9e92d targets: nightly: git_hash: 'mullvad-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 90cb3269f3fd7a8676d5724045b2403715797eef + git_hash: 35087956c0e382242935c2ce6e9cecfd44c112bc compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -77,7 +77,7 @@ var: torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/06/07 00:00:00' + browser_release_date: '2024/06/10 06:30:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.5a9-build1
by richard (＠richard) 07 Jun '24

07 Jun '24

richard pushed new tag mb-13.5a9-build1 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5a9-build1
by richard (＠richard) 07 Jun '24

07 Jun '24

richard pushed new tag tbb-13.5a9-build1 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.5-1-build11
by richard (＠richard) 07 Jun '24

07 Jun '24

richard pushed new tag firefox-android-115.2.1-13.5-1-build11 at The Tor Project / Applications / firefox-android -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.12.0esr-13.5-1-build2
by richard (＠richard) 07 Jun '24

07 Jun '24

richard pushed new tag mullvad-browser-115.12.0esr-13.5-1-build2 at The Tor Project / Applications / Mullvad Browser -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits June 2024