September 2020 - tbb-commits - lists.torproject.org

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: fixup! Bug 40028: Implement Tor Service controller
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: bf824c0f by Matthew Finkel at 2020-09-30T12:54:41+00:00 fixup! Bug 40028: Implement Tor Service controller Bug 40040: Try avoiding a race condition when starting Tor This does not prevent the race, but this increases the chances that the two racing operations do not happen in parallel. - - - - - 29abadbb by Matthew Finkel at 2020-09-30T22:03:40+00:00 Merge branch 'bug_40040_01' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/tor/TorController.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -119,6 +119,13 @@ class TorController( Prefs.setBridgesList(value) } + init { + // Bug 40040: Hacky: Initialize TorService when we are instantiated. This should + // help avoid a race condition involving copying assets and starting tor in TorService. + val torServiceStatus = Intent(context, TorService::class.java) + context.startService(torServiceStatus) + } + fun start() { // Register receiver lbm.registerReceiver( View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/294a617bf990… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/294a617bf990… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40106: Support using different geckoview series
by sysrqb＠torproject.org 30 Sep '20

30 Sep '20

commit 07262d2dbbbb645ba8f04ae94030276964b9a7bd Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 30 11:42:34 2020 +0000 Bug 40106: Support using different geckoview series We take the shortcut and just overwrite all the geckoview .aar files in our gradle-dependencies that are not breaking the build, which helps with fenix#40017, too. --- projects/android-components/build | 13 ++++++------- projects/fenix/build | 12 +++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/projects/android-components/build b/projects/android-components/build index 3cac44a..43016b0 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -8,9 +8,13 @@ mkdir /var/tmp/build [% IF !c("var/fetch_gradle_dependencies") %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] - # XXX: Make this more generic and not only for geckoview-beta. - geckoview_version=$(find . -type f -name geckoview-beta-*.aar | cut -d \- -f 6 | cut -d \. -f 1-3) + tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] + # This overwrites the release and beta geckoview .aar files in our + # gradle-dependencies directory to be sure that only the one we provide is + # getting used when building beta/release code. XXX: Find a way to make that + # work for nightly, too. + find $gradle_repo -type f $ -name geckoview-[^a-z]*.aar -o -name geckoview-beta*.aar $ -exec cp -f $distdir/geckoview/geckoview*.aar {} \; cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo @@ -18,7 +22,6 @@ mkdir /var/tmp/build # XXX: We could be smarter and just copy over the projects that are needed # according to the Gradle dependencies list. cp -rf $distdir/application-services/maven/org $gradle_repo - tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -38,10 +41,6 @@ patch -p1 < $rootdir/git.patch export LANG=C.UTF-8 patch -p1 < $rootdir/mavenLocal.patch - # Make sure our GeckoView dependency is used. XXX: Make this more generic and - # not only for geckoview-beta. - cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar - gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" gradle $gradle_args assembleGeckoBeta -x lint diff --git a/projects/fenix/build b/projects/fenix/build index c9d7e22..0613b2f 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -12,9 +12,12 @@ EOF [% IF !c("var/fetch_gradle_dependencies") %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] - # XXX: Make this more generic and not only for geckoview-beta. - geckoview_version=$(find . -type f -name geckoview-beta-*.aar | cut -d \- -f 6 | cut -d \. -f 1-3) + tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] + # This overwrites the release, beta, and nightly geckoview .aar files in our + # gradle-dependencies directory to be sure that only the one we provide is + # getting used when building beta/release code. + find $gradle_repo -type f -name geckoview*.aar -exec cp -f $distdir/geckoview/geckoview*.aar {} \; cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo @@ -24,7 +27,6 @@ EOF cp -rf $distdir/application-services/maven/org $gradle_repo tar -C $distdir -xf [% c('input_files_by_name/android-components') %] cp -rf $distdir/android-components/maven/org $gradle_repo - tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -45,10 +47,6 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ export LANG=C.UTF-8 patch -p1 < $rootdir/mavenLocal.patch - # Make sure our GeckoView dependency is used. XXX: Make this more generic and - # not only for geckoview-beta. - cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar - eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) if [ -z $MOZ_BUILD_DATE ] then

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40063: Do not sort search engines alphabetically
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 04c2a951 by Alex Catarineu at 2020-09-30T19:48:53+02:00 Bug 40063: Do not sort search engines alphabetically - - - - - 294a617b by Matthew Finkel at 2020-09-30T21:36:52+00:00 Merge remote-tracking branch 'acatgl/40063' into tor-browser-81.1.1-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt - app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt ===================================== @@ -26,7 +26,6 @@ import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.Config import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings -import java.util.Locale @SuppressWarnings("TooManyFunctions") open class FenixSearchEngineProvider( @@ -112,7 +111,7 @@ open class FenixSearchEngineProvider( engineList.copy( list = engineList.list.filter { installedIdentifiers.contains(it.identifier) - }.sortedBy { it.name.toLowerCase(Locale.getDefault()) }, + }, default = engineList.default?.let { if (installedIdentifiers.contains(it.identifier)) { it ===================================== app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt ===================================== @@ -32,7 +32,6 @@ import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getRootView import org.mozilla.fenix.ext.settings import org.mozilla.fenix.utils.allowUndo -import java.util.Locale abstract class SearchEngineListPreference @JvmOverloads constructor( context: Context, @@ -116,7 +115,6 @@ abstract class SearchEngineListPreference @JvmOverloads constructor( searchEngineList.list .filter { it.identifier != searchEngineList.default?.identifier } - .sortedBy { it.name.toLowerCase(Locale.getDefault()) } .forEachIndexed(setupSearchEngineItem) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/c211ca85cb0d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/c211ca85cb0d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40009: Change the default search engines
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: d451ae47 by Alex Catarineu at 2020-09-30T19:39:26+02: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. - - - - - b8ebf04f by Matthew Finkel at 2020-09-30T21:35:02+00:00 Merge remote-tracking branch 'acatgl/40009' into android-components-57.0.6-10.0-2 - - - - - 6 changed files: - 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 Changes: ===================================== components/browser/search/src/main/assets/search/list.json ===================================== @@ -1,842 +1,13 @@ { "default": { - "searchDefault": "Google", - "searchOrder": ["Google", "Bing"], + "searchDefault": "DuckDuckGo", + "searchOrder": ["DuckDuckGo", "YouTube", "Google", "DuckDuckGoOnion", "Startpage", "Twitter", "Wikipedia", "Yahoo"], "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "regionOverrides": { - "US": { - "google-b-m": "google-b-1-m" - } }, "locales": { - "ach": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia" - ] - } - }, - "an": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-an" - ] - } - }, - "ar": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ar" - ] - } - }, - "as": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-as" - ] - } - }, - "ast": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ast" - ] - } - }, - "az": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "azerdict", "wikipedia-az" - ] - } - }, - "be": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-be", "yandex.by" - ] - }, - "BY": { - "searchDefault": "Яндекс" - }, - "KZ": { - "searchDefault": "Яндекс" - }, - "RU": { - "searchDefault": "Яндекс" - }, - "TR": { - "searchDefault": "Яндекс" - } - }, - "bg": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "pazaruvaj", "wikipedia-bg" - ] - } - }, - "bn": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bn" - ] - } - }, - "bn-BD": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bn" - ] - } - }, - "bn-IN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "rediff", "wikipedia-bn" - ] - } - }, - "br": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-br" - ] - } - }, - "bs": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bs" - ] - } - }, - "ca": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-ca", "diec2" - ] - } - }, - "cak": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazondotcom", "ddg", "wikipedia-es" - ] - } - }, - "cs": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "heureka-cz", "mapy-cz", "seznam-cz", "wikipedia-cz" - ] - } - }, - "cy": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-cy" - ] - } - }, - "da": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "ddg", "wikipedia-da" - ] - } - }, - "de": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "ecosia", "qwant", "wikipedia-de" - ] - } - }, - "dsb": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "wikipedia-dsb" - ] - } - }, - "el": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "skroutz", "wikipedia-el" - ] - } - }, - "en-CA": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-ca", "ddg", "wikipedia" - ] - } - }, - "en-GB": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia" - ] - }, - "RU": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia", "yandex-en" - ] - } - }, - "en-US": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia" - ] - }, - "RU": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia", "yandex-en" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-ca", "amazon-au", "google-2018", "duckduckgo", "google" - ] - } - }, - "en-ZA": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia" - ] - } - }, - "eo": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "reta-vortaro", "wikipedia-eo" - ] - } - }, - "es-AR": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "mercadolibre-ar", "wikipedia-es" - ] - } - }, - "es-CL": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "drae", "mercadolibre-cl", "wikipedia-es" - ] - } - }, - "es-ES": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-es" - ] - } - }, - "es-MX": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "mercadolibre-mx", "wikipedia-es" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-mx" - ] - } - }, - "et": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "ddg", "wikipedia-et" - ] - } - }, - "eu": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "elebila", "wikipedia-eu" - ] - } - }, - "fa": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-fa" - ] - } - }, - "ff": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-fr", "ddg", "wikipedia-fr" - ] - } - }, - "fi": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazondotcom", "ddg", "wikipedia-fi" - ] - } - }, - "fr": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "qwant", "wikipedia-fr" - ] - } - }, - "fy-NL": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-fy-NL", "bolcom-fy-NL" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-nl" - ] - } - }, - "ga-IE": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "ddg", "tearma", "wikipedia-ga-IE" - ] - } - }, - "gd": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "faclair-beag", "wikipedia-gd" - ] - } - }, - "gl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-gl" - ] - } - }, - "gn": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-gn" - ] - } - }, - "gu-IN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-gu" - ] - } - }, - "he": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-he" - ] - } - }, - "hi-IN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-hi" - ] - } - }, - "hr": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-hr" - ] - } - }, - "hsb": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "wikipedia-hsb" - ] - } - }, - "hu": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu" - ] - } - }, - "hy-AM": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "list-am", "wikipedia-hy-AM" - ] - } - }, - "ia": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ia" - ] - } - }, - "id": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-id" - ] - } - }, - "is": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is" - ] - } - }, - "it": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-it" - ] - } - }, - "ja": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-jp", "bing", "ddg", "wikipedia-ja", "yahoo-jp" - ] - } - }, - "ka": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ka" - ] - } - }, - "kab": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-kab" - ] - } - }, - "kk": { - "default": { - "visibleDefaultEngines": [ - "yandex", "google-b-m", "bing", "ddg", "wikipedia-kk" - ] - }, - "KZ": { - "searchDefault": "Яндекс" - }, - "BY": { - "searchDefault": "Яндекс" - }, - "RU": { - "searchDefault": "Яндекс" - }, - "TR": { - "searchDefault": "Яндекс" - } - }, - "km": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-km" - ] - } - }, - "kn": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-kn", "wiktionary-kn" - ] - } - }, - "ko": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "danawa-kr", "daum-kr", "naver-kr" - ] - } - }, - "lij": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-it", "ddg", "wikipedia-lij" - ] - } - }, - "lo": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-lo" - ] - } - }, - "lt": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-lt" - ] - } - }, - "ltg": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "wikipedia-ltg" - ] - } - }, - "lv": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "salidzinilv", "sslv", "wikipedia-lv" - ] - } - }, - "mai": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-hi" - ] - } - }, - "meh": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] - } - }, - "mix": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] - } - }, - "ml": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-ml" - ] - } - }, - "mr": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "rediff", "wikipedia-mr" - ] - } - }, - "ms": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ms" - ] - } - }, - "my": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-my" - ] - } - }, - "nb-NO": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "gulesider-mobile-NO", "wikipedia-NO" - ] - } - }, - "ne-NP": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-ne" - ] - } - }, - "nl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "bolcom-nl", "ddg", "wikipedia-nl" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-nl" - ] - } - }, - "nn-NO": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "gulesider-mobile-NO", "wikipedia-NN" - ] - } - }, - "oc": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-oc", "wiktionary-oc" - ] - } - }, - "or": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-or", "wiktionary-or" - ] - } - }, - "pa-IN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pa" - ] - } - }, - "pl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pl" - ] - } - }, - "pt-BR": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pt" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-br" - ] - } - }, - "pt-PT": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-pt" - ] - } - }, - "rm": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm" - ] - } - }, - "ro": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-ro" - ] - } - }, - "ru": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "yandex-ru", "wikipedia-ru" - ] - }, - "RU": { - "searchDefault": "Яндекс" - }, - "BY": { - "searchDefault": "Яндекс" - }, - "KZ": { - "searchDefault": "Яндекс" - }, - "TR": { - "searchDefault": "Яндекс" - } - }, - "sk": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "azet-sk", "slovnik-sk", "wikipedia-sk" - ] - } - }, - "sl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "ceneje", "odpiralni", "wikipedia-sl" - ] - } - }, - "son": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "bing", "amazon-fr", "wikipedia-fr" - ] - } - }, - "sq": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-sq" - ] - } - }, - "sr": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-sr" - ] - } - }, - "sv-SE": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "prisjakt-sv-SE", "ddg", "wikipedia-sv-SE" - ] - } - }, - "ta": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta" - ] - } - }, - "te": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" - ] - } - }, - "th": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-th" - ] - } - }, - "tl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg" - ] - } - }, - "tr": { - "default": { - "visibleDefaultEngines": [ - "yandex-tr", "google-b-m", "ddg", "wikipedia-tr" - ] - }, - "TR": { - "searchDefault": "Yandex" - }, - "BY": { - "searchDefault": "Yandex" - }, - "KZ": { - "searchDefault": "Yandex" - }, - "RU": { - "searchDefault": "Yandex" - } - }, - "trs": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] - } - }, - "uk": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-uk", "hotline-ua" - ] - } - }, - "ur": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ur" - ] - } - }, - "uz": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-uz" - ] - } - }, - "vi": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "coccoc", "ddg", "wikipedia-vi" - ] - } - }, - "wo": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-wo" - ] - } - }, - "xh": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia" - ] - } - }, - "zam": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-es" - ] - } - }, - "zh-CN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "baidu", "bing", "ddg", "taobao", "wikipedia-zh-CN" - ] - }, - "CN": { - "searchDefault": "百度" - } - }, - "zh-TW": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-zh-TW" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "duckduckgo" - ] - } - } } } ===================================== components/browser/search/src/main/assets/searchplugins/ddg-onion.xml ===================================== @@ -0,0 +1,11 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>DuckDuckGoOnion</ShortName> +<Description>Duck Duck Go Onion</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image> +<Url type="text/html" method="POST" template="https://3g2upl4pq6kufc4m.onion"> + <Param name="q" value="{searchTerms}"/> +</Url> +<SearchForm>https://3g2upl4pq6kufc4m.onion</SearchForm> +</SearchPlugin> + ===================================== components/browser/search/src/main/assets/searchplugins/ddg.xml ===================================== @@ -4,20 +4,11 @@ <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> <ShortName>DuckDuckGo</ShortName> +<Description>Duck Duck Go</Description> <InputEncoding>UTF-8</InputEncoding> <Image width="16" height="16">data:image/png;base64,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</Image> -<Url type="application/x-suggestions+json" method="GET" template="https://ac.duckduckgo.com/ac/"> +<Url type="text/html" method="POST" template="https://duckduckgo.com"> <Param name="q" value="{searchTerms}"/> - <Param name="type" value="list"/> -</Url> - -<Url type="text/html" method="GET" template="https://duckduckgo.com/"> - <Param name="q" value="{searchTerms}" /> - <Param name="t" value="fpas" /> -</Url> -<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/"> - <Param name="q" value="{searchTerms}" /> - <Param name="t" value="ftas" /> </Url> <SearchForm>https://duckduckgo.com</SearchForm> </SearchPlugin> ===================================== components/browser/search/src/main/assets/searchplugins/startpage.xml ===================================== @@ -0,0 +1,11 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>Startpage</ShortName> +<Description>Start Page</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH++LN1/vmvbf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image> + +<Url type="text/html" method="POST" template="https://startpage.com/rto/search"> + <Param name="q" value="{searchTerms}"/> +</Url> +<SearchForm>https://startpage.com/rto/search/</SearchForm> +</SearchPlugin> ===================================== components/browser/search/src/main/assets/searchplugins/yahoo.xml ===================================== @@ -0,0 +1,22 @@ + + +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>Yahoo</ShortName> +<Description>Yahoo Search</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/png;base64,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</Image> +<Url type="application/x-suggestions+json" method="GET" + template="https://search.yahoo.com/sugg/ff"> + <Param name="output" value="fxjson" /> + <Param name="appid" value="ffd" /> + <Param name="command" value="{searchTerms}" /> +</Url> +<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search" + resultdomain="yahoo.com" rel="searchform"> + <Param name="p" value="{searchTerms}"/> + <Param name="ei" value="UTF-8"/> + <Param name="hspart" value="mozilla"/> +</Url> +</SearchPlugin> ===================================== components/browser/search/src/main/assets/searchplugins/youtube.xml ===================================== @@ -0,0 +1,10 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<ShortName>YouTube</ShortName> +<Description>YouTube - Videos</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgNkQkIDZGiCA2RzAgNkcwIDZH/CA2R/wgNkf8IDZH/CA2R/wgNkf8IDZH/CA2R2AgNkcwIDZHMCA2RhAgNkQYIDpWHCA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpWHCQ6ZzAkOmf8JDpn/CQ6Z/wkOmf8JDpb/BQhc/wgMgf8JDpn/CQ6Z/wkOmf8JDpn/CQ6Z/wkOmf8JDpn/CQ6ZzAkOnuoJDp7/CQ6e/wkOnv8JDp7/Exed/8jIy/9RU4j/Bwp0/wkOm/8JDp7/CQ6e/wkOnv8JDp7/CQ6e/wkOnuoJD6T8CQ+k/wkPpP8JD6T/CQ+k/xUbo//V1dX/1dXV/4yNrP8QFG//CA6Y/wkPpP8JD6T/CQ+k/wkPpP8JD6T8CQ+q/wkPqv8JD6r/CQ+q/wkPqv8WG6n/3d3d/93d3f/d3d3/v7/M/y0wjv8JD6r/CQ+q/wkPqv8JD6r/CQ+q/woQr/8KEK//ChCv/woQr/8KEK//Fx2v/+fn5//n5+f/5+fn/+jo6P+YmtP/ChCv/woQr/8KEK//ChCv/woQr/8KELX8ChC1/woQtf8KELX/ChC1/xgdtf/x8fH/8fHx//Ly8v+bndv/Ehi3/woQtf8KELX/ChC1/woQtf8KELX8ChG76goRu/8KEbv/ChG7/woRu/8YH77/+fn5/+/v9/9fY9H/ChG7/woRu/8KEbv/ChG7/woRu/8KEbv/ChG76goRwMwKEcD/ChHA/woRwP8KEcD/EBfB/6Ol5/8tM8n/ChHA/woRwP8KEcD/ChHA/woRwP8KEcD/ChHA/woRwMwLEcSHCxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcSHCxLICQsSyKULEsjMCxLI+QsSyP8LEsj/CxLI/wsSyP8LEsj/CxLI/wsSyP8LEsj/CxLI0gsSyMwLEsiiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAD//wAA//8AAA==</Image> +<SearchForm>https://www.youtube.com/index</SearchForm> +<Url type="text/html" method="GET" template="https://www.youtube.com/results?search_query={searchTerms}&search=Search" resultDomain="youtube.com"> +</Url><Url type="application/x-suggestions+json" method="GET" template="https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&…" resultDomain="suggestqueries.google.com"> +</Url> +</SearchPlugin> 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-build/master] Bug 40060: Define versionName in Fenix build
by gk＠torproject.org 30 Sep '20

30 Sep '20

commit 46c2b00c782ad2f977125e9e3283c0944409a30e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 28 23:01:14 2020 +0000 Bug 40060: Define versionName in Fenix build In addition, we delete the hard-coded Fenix specific `version` and we use `abbrev`, instead. --- projects/fenix/build | 3 ++- projects/fenix/config | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index eedddcc..c9d7e22 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -56,7 +56,8 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ exit 1 fi - $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint + version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])' + $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint # XXX We need the build variant in lower case. Do something smarter here. v=[% c("variant") %] cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] diff --git a/projects/fenix/config b/projects/fenix/config index 171eb6b..1798e0d 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 10.0a6 +version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git @@ -22,7 +22,6 @@ targets: nightly: git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 - version: '[% c("abbrev") %]' variant: Beta input_files:

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 25 commits: fixup! Bug 40028: Implement Tor connect and logger screens
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: d404d769 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens Bug 40044: Fixup Connect screen - - - - - ab897368 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens Bug 40044: Fixup Connect screen Add settings cog - - - - - 50a2e757 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - fc5c3aa6 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - 091081a9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - 2e5d5aed by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - f61219e9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - e7c7cefc by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - 5d14717f by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - 3a96ef08 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment Move TorController's BroadcastReceiver registration into FenixApplication because TorController misses events when registration is controlled by HomeFragment. Initialize tor-android-service with FenixApplication's Context. - - - - - 90787eaa by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - a66da2fc by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - b26b2df1 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - d01d44a7 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Rename localBroadcastReceiver as persistentBroadcastReceiver such that it isn't confused with the checkIsTorStarted receiver. - - - - - 0518acac by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Minor improvements - - - - - 0585f943 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Correct indentation and add restartTor() function - - - - - 1ad711c6 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Define enum class for tor's status and define current state using the enums. - - - - - 22b7ca55 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Add access/mutator for bridge information. - - - - - d62480a2 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller - - - - - dfc7234f by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Onboarding - - - - - 014c4b76 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Define bootstrapping events and Quick Start - - - - - b9f9c4b9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40034: Disable PWA onboading - - - - - 1f8ead03 by Matthew Finkel at 2020-09-30T02:21:09+00:00 Bug 40041: Implement Tor Network Settings - - - - - 313a51e8 by Matthew Finkel at 2020-09-30T02:21:09+00:00 Bug 40041: Integrate Tor Network Settings - - - - - c211ca85 by Matthew Finkel at 2020-09-30T14:10:55+00:00 Merge branch 'bug_40041_09' into tor-browser-81.1.1-10.0-1 - - - - - 30 changed files: - 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/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/home/Mode.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingDonateViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/torbootstrap/BootstrapPagerAdapter.kt - app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorNetworkSettingsFragment.kt - app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt - + app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt - app/src/main/java/org/mozilla/fenix/tor/TorController.kt - app/src/main/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt - + app/src/main/res/drawable/ic_onion_pattern.xml - + app/src/main/res/drawable/ic_tor_config_bridge.xml - + app/src/main/res/drawable/ic_tor_connect_computer_graphic.xml - + app/src/main/res/drawable/ic_tor_network_settings.xml - app/src/main/res/drawable/rounded_corners.xml - app/src/main/res/drawable/tor_bootstrap_background_gradient.xml - app/src/main/res/layout/fragment_home.xml - app/src/main/res/layout/tor_bootstrap_connect.xml - app/src/main/res/layout/tor_bootstrap_logger.xml - app/src/main/res/navigation/nav_graph.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0a4fbe8a8553… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0a4fbe8a8553… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40002: Ensure system download manager is not used
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: 8c794786 by Alex Catarineu at 2020-09-29T17:38:13+02:00 Bug 40002: Ensure system download manager is not used - - - - - 266410c6 by Matthew Finkel at 2020-09-30T12:53:55+00:00 Merge remote-tracking branch 'acatgl/40002' into android-components-57.0.6-10.0-2 - - - - - 3 changed files: - 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 Changes: ===================================== components/feature/downloads/build.gradle ===================================== @@ -20,6 +20,8 @@ android { arg("room.schemaLocation", "$projectDir/schemas".toString()) } } + + buildConfigField("boolean", "ANDROID_DOWNLOADS_INTEGRATION", "false") } buildTypes { ===================================== components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt ===================================== @@ -326,7 +326,9 @@ abstract class AbstractFetchDownloadService : Service() { PAUSED -> DownloadNotification.createPausedDownloadNotification(context, download) FAILED -> DownloadNotification.createDownloadFailedNotification(context, download) COMPLETED -> { - addToDownloadSystemDatabaseCompat(download.state) + if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION) { + addToDownloadSystemDatabaseCompat(download.state) + } DownloadNotification.createDownloadCompletedNotification(context, download) } CANCELLED -> { @@ -688,7 +690,7 @@ abstract class AbstractFetchDownloadService : Service() { val downloadWithUniqueFileName = makeUniqueFileNameIfNecessary(download, append) updateDownloadState(downloadWithUniqueFileName) - if (getSdkVersion() >= Build.VERSION_CODES.Q && !isExternalStorageLegacy()) { + if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION && getSdkVersion() >= Build.VERSION_CODES.Q && !isExternalStorageLegacy()) { useFileStreamScopedStorage(downloadWithUniqueFileName, block) } else { useFileStreamLegacy(downloadWithUniqueFileName, append, block) ===================================== components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt ===================================== @@ -25,7 +25,6 @@ import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.content.DownloadState import mozilla.components.browser.state.store.BrowserStore import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.FRAGMENT_TAG -import mozilla.components.feature.downloads.manager.AndroidDownloadManager import mozilla.components.feature.downloads.manager.DownloadManager import mozilla.components.feature.downloads.manager.noop import mozilla.components.feature.downloads.manager.onDownloadStopped @@ -69,7 +68,7 @@ class DownloadsFeature( internal val useCases: DownloadsUseCases, override var onNeedToRequestPermissions: OnNeedToRequestPermissions = { }, onDownloadStopped: onDownloadStopped = noop, - private val downloadManager: DownloadManager = AndroidDownloadManager(applicationContext, store), + private val downloadManager: DownloadManager, private val tabId: String? = null, private val fragmentManager: FragmentManager? = null, private val promptsStyling: PromptsStyling? = null, 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-build/master] Bump mozac rebase branch
by sysrqb＠torproject.org 28 Sep '20

28 Sep '20

commit 13a9ee605b57a013b5b3c044ad127dfab320ecb5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 28 16:16:05 2020 +0000 Bump mozac rebase branch --- projects/android-components/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index c633375..1093a07 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-2-build1' git_url: https://gitlab.torproject.org/tpo/applications/android-components.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg @@ -18,7 +18,7 @@ var: targets: nightly: - git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 input_files:

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-57.0.6-10.0-2
by Matthew Finkel 28 Sep '20

28 Sep '20

Matthew Finkel pushed new branch android-components-57.0.6-10.0-2 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-78.3.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit be335bfb52b05742dc27a91ff5993700bb05412e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 15:52:20 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..4320a0de1d3a 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 4e67ee2ef26e28da0f02a0e43e22a61ee33c6d4d +Subproject commit 4320a0de1d3aab613a30c77c47ccfa812dab4441

1 0