tbb-commits July 2018

tbb-commits@lists.torproject.org

2 participants
65 discussions

[tor-launcher/master] Bug 26985: Help button icons missing
by gk＠torproject.org 31 Jul '18

31 Jul '18

commit 2a2a1ac8da14983ff682c46e0d8426cb2590ec41 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 31 13:54:26 2018 -0400 Bug 26985: Help button icons missing The image we previously used has been removed from Firefox, so use ESR 60's new help button image instead. Background shading is used for the hover and active states. --- src/chrome/content/network-settings-overlay.xul | 6 ++++-- src/chrome/skin/network-settings.css | 26 +++++++-------… [View More]----------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 3d42c15..35b9fc7 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -98,8 +98,10 @@ <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" oncommand="onBridgeTypeRadioChange()"/> - <button class="helpButton" - oncommand="onOpenHelp('bridgeHelpContent')"/> + <vbox pack="center"> + <button class="helpButton" + oncommand="onOpenHelp('bridgeHelpContent')"/> + </vbox> <spacer style="width: 3em"/> <menulist id="defaultBridgeType" sizetopopup="always" placeholder="&torsettings.useBridges.default.placeholder;"> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 9a02493..c6a9f0b 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -133,8 +133,9 @@ wizard.os-mac #bridgeList { /* reuse Mozilla's help button from the Firefox hamburger menu */ .helpButton { - list-style-image: url(chrome://browser/skin/menuPanel-help.png); - -moz-image-region: rect(0, 16px, 16px, 0); + background: url('chrome://global/skin/icons/help.svg') no-repeat center center; + background-size: 16px 16px; + cursor: pointer; -moz-appearance: none; height: 16px; width: 16px; @@ -152,26 +153,13 @@ wizard.os-mac #bridgeList { } .helpButton:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); + background-color: rgba(12, 12, 13, 0.1); + border-radius: 50%; } .helpButton:hover:active { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -@media (min-resolution: 8.1dppx) { - .helpButton { - list-style-image: url(chrome://browser/skin/menuPanel-help@2x.png); - -moz-image-region: rect(0, 32px, 32px, 0); - } - - .helpButton:hover { - -moz-image-region: rect(0, 64px, 32px, 32px); - } - - .helpButton:hover:active { - -moz-image-region: rect(0, 96px, 32px, 64px); - } + background-color: rgba(12, 12, 13, 0.15); + border-radius: 50%; } #progressContent[isShowingReconfigure] description, [View Less]

1 0

[tor-launcher/master] Bug 25509: Improve the proxy help text.
by gk＠torproject.org 31 Jul '18

31 Jul '18

commit 392ba14d7d148edafa58eabb1ea18d95e917dd6d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 31 14:07:33 2018 -0400 Bug 25509: Improve the proxy help text. --- src/chrome/locale/en/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 4615146..c6c5687 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-… [View More]

1 0

[tor-browser-build/master] Bug 26951: Fix execdesktop argument passing
by gk＠torproject.org 31 Jul '18

31 Jul '18

commit 09111c4e8df1272dcbcf02f5c823e139801c44c4 Author: Ben Burrill <bburrill98(a)gmail.com> Date: Thu Jul 26 14:31:54 2018 -0700 Bug 26951: Fix execdesktop argument passing Prior to this change, arguments with spaces were flattened, so running ./start-tor-browser.desktop --search "hello world" would be converted to ./start-tor-browser.desktop --search hello world opening up two windows, one search for "hello" and one trying to … [View More]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1474306 - Fix typo in the extension optionsType handler. r=Mossop
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit 63bb7813511ad99ecbbbc7f0fb610718847ff108 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Jul 9 07:24:00 2018 +0300 Bug 1474306 - Fix typo in the extension optionsType handler. r=Mossop AddonManager.OPTIONS_INLINE_BROWSER was replaced by AddonManager.OPTIONS_TYPE_INLINE_BROWSER. --- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/… [View More]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1455165 - Filter external apps out if needed. r=mcomella
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit 3d30d5d1f2ebbdf60af0180af435afad4ba7e773 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Apr 18 17:16:00 2018 +0300 Bug 1455165 - Filter external apps out if needed. r=mcomella --- mobile/android/chrome/content/browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 5f49c07a5ca5..2dc973a15ee7 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/… [View More]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1459420 - HLS Player doesn't use the centralized Proxy Selector r=mcomella GeckoHlsPlayer uses the default http ExoPlayer handler, called DefaultHttpDataSource. It uses URL::openConnection instead of the Firefox ProxySelector.
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit 7aeef47671133760672f881b38117cb4070f32b3 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Jun 4 05:15:00 2018 +0300 Bug 1459420 - HLS Player doesn't use the centralized Proxy Selector r=mcomella GeckoHlsPlayer uses the default http ExoPlayer handler, called DefaultHttpDataSource. It uses URL::openConnection instead of the Firefox ProxySelector. This patch updates the ExoPlayer DefaultHttpDataSource to use the ProxySelector. --- .../exoplayer2/upstream/… [View More]DefaultHttpDataSource.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 599cdddeb91f..75e1f675c5eb 100644 --- a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -31,6 +31,7 @@ import java.lang.reflect.Method; import java.net.HttpURLConnection; import java.net.NoRouteToHostException; import java.net.ProtocolException; +import java.net.URISyntaxException; import java.net.URL; import java.util.List; import java.util.Map; @@ -38,6 +39,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.mozilla.gecko.util.ProxySelector; + /** * An {@link HttpDataSource} that uses Android's {@link HttpURLConnection}. * <p> @@ -193,6 +196,8 @@ public class DefaultHttpDataSource implements HttpDataSource { } catch (IOException e) { throw new HttpDataSourceException("Unable to connect to " + dataSpec.uri.toString(), e, dataSpec, HttpDataSourceException.TYPE_OPEN); + } catch (URISyntaxException e) { + throw new HttpDataSourceException("URI invalid: " + dataSpec.uri.toString(), dataSpec, HttpDataSourceException.TYPE_OPEN); } int responseCode; @@ -337,7 +342,7 @@ public class DefaultHttpDataSource implements HttpDataSource { /** * Establishes a connection, following redirects to do so where permitted. */ - private HttpURLConnection makeConnection(DataSpec dataSpec) throws IOException { + private HttpURLConnection makeConnection(DataSpec dataSpec) throws IOException, URISyntaxException { URL url = new URL(dataSpec.uri.toString()); byte[] postBody = dataSpec.postBody; long position = dataSpec.position; @@ -389,8 +394,14 @@ public class DefaultHttpDataSource implements HttpDataSource { * @param followRedirects Whether to follow redirects. */ private HttpURLConnection makeConnection(URL url, byte[] postBody, long position, - long length, boolean allowGzip, boolean followRedirects) throws IOException { - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + long length, boolean allowGzip, boolean followRedirects) throws IOException, URISyntaxException { + /** + * Tor Project modified the way the connection object was created. For the sake of + * simplicity, instead of duplicating the whole file we changed the connection object + * to use the ProxySelector. + */ + HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); + connection.setConnectTimeout(connectTimeoutMillis); connection.setReadTimeout(readTimeoutMillis); if (defaultRequestProperties != null) { [View Less]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1459089 - Don't use OS Locale when resistFingerprinting is enabled. When the OS Locale is used, it leaks the OS language in the HTTP Accept-Language header. r=mcomella
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit d352f450f3edd120df9b7ab973db45069ef22bb2 Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu May 3 18:28:00 2018 +0300 Bug 1459089 - Don't use OS Locale when resistFingerprinting is enabled. When the OS Locale is used, it leaks the OS language in the HTTP Accept-Language header. r=mcomella --HG-- extra : rebase_source : 7b0dc69be25c5076696a6bd9db7611cd5b0abbad --- mobile/android/chrome/content/browser.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --… [View More]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26528 - Don't allow Fennec to use UpdateService when installed through the app store
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 1388fbe6fd988603cbfe10eec92f9f9be578a18c Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Jun 27 12:12:22 2018 -0300 Bug 26528 - Don't allow Fennec to use UpdateService when installed through the app store App stores such as Google Play or F-Droid have their own update service. The Fennec UpdateService should be used just when the user installs it by themselves. --- .../base/java/org/mozilla/gecko/preferences/GeckoPreferences.java | 2 +- .../… [View More]base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java | 2 +- .../geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java index 3675afa9c052..1042a7c2c990 100644 --- a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java @@ -663,7 +663,7 @@ public class GeckoPreferences pref.setOnPreferenceChangeListener(this); if (PREFS_UPDATER_AUTODOWNLOAD.equals(key)) { - if (!AppConstants.MOZ_UPDATER || ContextUtils.isInstalledFromGooglePlay(this)) { + if (!AppConstants.MOZ_UPDATER || ContextUtils.isInstalledFromAppStore(this)) { preferences.removePreference(pref); i--; continue; diff --git a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java index c4d198ae735f..c63fad412b00 100644 --- a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java @@ -133,7 +133,7 @@ public class UpdateServiceHelper { } public static boolean isUpdaterEnabled(final Context context) { - return AppConstants.MOZ_UPDATER && isEnabled && !ContextUtils.isInstalledFromGooglePlay(context); + return AppConstants.MOZ_UPDATER && isEnabled && !ContextUtils.isInstalledFromAppStore(context); } public static void setUpdateUrl(Context context, String url) { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java index 0228e144fd89..9a793d3c1e8b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java @@ -13,6 +13,7 @@ import android.text.TextUtils; public class ContextUtils { private static final String INSTALLER_GOOGLE_PLAY = "com.android.vending"; + private static final String INSTALLER_FDROID = "org.fdroid.fdroid"; private ContextUtils() {} @@ -37,13 +38,13 @@ public class ContextUtils { } } - public static boolean isInstalledFromGooglePlay(final Context context) { + public static boolean isInstalledFromAppStore(final Context context) { final String installerPackageName = context.getPackageManager().getInstallerPackageName(context.getPackageName()); if (TextUtils.isEmpty(installerPackageName)) { return false; } - return INSTALLER_GOOGLE_PLAY.equals(installerPackageName); + return INSTALLER_GOOGLE_PLAY.equals(installerPackageName) || INSTALLER_FDROID.equals(installerPackageName); } } [View Less]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit ce3ad196040db4886e953cf13fc8d24fdf712d4b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 2 17:04:11 2018 +0000 Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files. Based on Orfox initial commits with fixup commits squashed and rebranding Orfox -> Tor Browser See original source from ce3fab3c90eb4a3892181ee36b037da04c785d99 https://github.com/guardianproject/tor-browser.git Dropped symlinks --- .… [View More]mozconfig-android | 38 +++++++++++++++++++++ .../android/base/locales/en-US/android_strings.dtd | 2 +- mobile/android/branding/torbrowser/configure.sh | 8 +++++ .../android/branding/torbrowser/content/about.png | Bin 0 -> 16858 bytes .../branding/torbrowser/content/favicon32.png | Bin 0 -> 1797 bytes .../branding/torbrowser/content/favicon64.png | Bin 0 -> 3993 bytes mobile/android/branding/torbrowser/content/jar.mn | 9 +++++ .../android/branding/torbrowser/content/moz.build | 7 ++++ mobile/android/branding/torbrowser/ic_launcher.zip | Bin 0 -> 96525 bytes mobile/android/branding/torbrowser/icon.png | Bin 0 -> 36456 bytes .../branding/torbrowser/locales/Makefile.in | 5 +++ .../branding/torbrowser/locales/en-US/brand.dtd | 9 +++++ .../torbrowser/locales/en-US/brand.properties | 7 ++++ mobile/android/branding/torbrowser/locales/jar.mn | 11 ++++++ .../android/branding/torbrowser/locales/moz.build | 7 ++++ mobile/android/branding/torbrowser/moz.build | 7 ++++ .../branding/torbrowser/res/drawable-hdpi/icon.png | Bin 0 -> 3549 bytes .../torbrowser/res/drawable-hdpi/large_icon.png | Bin 0 -> 9558 bytes .../res/drawable-hdpi/launcher_widget.png | Bin 0 -> 14001 bytes .../branding/torbrowser/res/drawable-mdpi/icon.png | Bin 0 -> 2577 bytes .../torbrowser/res/drawable-mdpi/large_icon.png | Bin 0 -> 5878 bytes .../res/drawable-mdpi/launcher_widget.png | Bin 0 -> 7661 bytes .../res/drawable-nodpi/firstrun_welcome.png | Bin 0 -> 48391 bytes .../torbrowser/res/drawable-xhdpi/icon.png | Bin 0 -> 5878 bytes .../torbrowser/res/drawable-xhdpi/large_icon.png | Bin 0 -> 13553 bytes .../res/drawable-xhdpi/launcher_widget.png | Bin 0 -> 21223 bytes .../torbrowser/res/drawable-xhdpi/widget_icon.png | Bin 0 -> 4381 bytes .../torbrowser/res/drawable-xxhdpi/icon.png | Bin 0 -> 9558 bytes .../torbrowser/res/drawable-xxhdpi/large_icon.png | Bin 0 -> 13553 bytes .../res/drawable-xxhdpi/launcher_widget.png | Bin 0 -> 32686 bytes .../torbrowser/res/drawable-xxxhdpi/icon.png | Bin 0 -> 13553 bytes mobile/android/branding/torbrowser/torbrowser.png | Bin 0 -> 55962 bytes mobile/android/branding/torbrowser/torbrowser.xcf | Bin 0 -> 267775 bytes .../mozharness/mozilla/testing/testbase.py | 7 ++-- 34 files changed, 114 insertions(+), 3 deletions(-) diff --git a/.mozconfig-android b/.mozconfig-android new file mode 100755 index 000000000000..efcb1c5415c2 --- /dev/null +++ b/.mozconfig-android @@ -0,0 +1,38 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +mk_add_options MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +# Android +ac_add_options --enable-application=mobile/android +ac_add_options --target=arm-linux-androideabi +ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r15c) +ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location +ac_add_options --with-branding=mobile/android/branding/torbrowser + +if [ -n "${TB_BUILD_WITH_DISTRIBUTION}" ]; then + ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +fi + +#enable ccache to set amount of cache assigned for build. +ac_add_options --with-ccache + +ac_add_options --disable-tor-browser-update +ac_add_options --disable-signmar +ac_add_options --disable-verify-mar + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +#ac_add_options --disable-ctypes diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index 917ed534fc9f..b4e2296268c1 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -4,7 +4,7 @@ <!ENTITY firstrun_panel_title_welcome "Welcome"> <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> -<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web."> +<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacy"> <!ENTITY firstrun_privacy_message "Browse like no one\'s watching"> <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing."> diff --git a/mobile/android/branding/torbrowser/configure.sh b/mobile/android/branding/torbrowser/configure.sh new file mode 100644 index 000000000000..79b7e718cbfd --- /dev/null +++ b/mobile/android/branding/torbrowser/configure.sh @@ -0,0 +1,8 @@ +# 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/. + +ANDROID_PACKAGE_NAME=org.torproject.torbrowser +MOZ_APP_DISPLAYNAME="Tor Browser for Android" +MOZ_UPDATER= +MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/torbrowser/content/about.png b/mobile/android/branding/torbrowser/content/about.png new file mode 100644 index 000000000000..3819f6337a17 Binary files /dev/null and b/mobile/android/branding/torbrowser/content/about.png differ diff --git a/mobile/android/branding/torbrowser/content/favicon32.png b/mobile/android/branding/torbrowser/content/favicon32.png new file mode 100644 index 000000000000..0c414d6ca46b Binary files /dev/null and b/mobile/android/branding/torbrowser/content/favicon32.png differ diff --git a/mobile/android/branding/torbrowser/content/favicon64.png b/mobile/android/branding/torbrowser/content/favicon64.png new file mode 100644 index 000000000000..bfc9e05538c6 Binary files /dev/null and b/mobile/android/branding/torbrowser/content/favicon64.png differ diff --git a/mobile/android/branding/torbrowser/content/jar.mn b/mobile/android/branding/torbrowser/content/jar.mn new file mode 100644 index 000000000000..f934ed5e4634 --- /dev/null +++ b/mobile/android/branding/torbrowser/content/jar.mn @@ -0,0 +1,9 @@ +# 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/. + +chrome.jar: +% content branding %content/branding/ + content/branding/about.png (about.png) + content/branding/favicon32.png (favicon32.png) + content/branding/favicon64.png (favicon64.png) diff --git a/mobile/android/branding/torbrowser/content/moz.build b/mobile/android/branding/torbrowser/content/moz.build new file mode 100644 index 000000000000..3bbe6729759c --- /dev/null +++ b/mobile/android/branding/torbrowser/content/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +JAR_MANIFESTS += ['jar.mn'] diff --git a/mobile/android/branding/torbrowser/ic_launcher.zip b/mobile/android/branding/torbrowser/ic_launcher.zip new file mode 100644 index 000000000000..69601344519e Binary files /dev/null and b/mobile/android/branding/torbrowser/ic_launcher.zip differ diff --git a/mobile/android/branding/torbrowser/icon.png b/mobile/android/branding/torbrowser/icon.png new file mode 100644 index 000000000000..6e0051b95a32 Binary files /dev/null and b/mobile/android/branding/torbrowser/icon.png differ diff --git a/mobile/android/branding/torbrowser/locales/Makefile.in b/mobile/android/branding/torbrowser/locales/Makefile.in new file mode 100644 index 000000000000..82f614ecea29 --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/Makefile.in @@ -0,0 +1,5 @@ +# 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/. + +DEFINES += -DAB_CD=$(AB_CD) diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.dtd b/mobile/android/branding/torbrowser/locales/en-US/brand.dtd new file mode 100644 index 000000000000..01346be36a7c --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/en-US/brand.dtd @@ -0,0 +1,9 @@ + + +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY vendorShortName "The Tor Project"> + +<!ENTITY brandPocket ""> diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.properties b/mobile/android/branding/torbrowser/locales/en-US/brand.properties new file mode 100644 index 000000000000..3015d2376518 --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/en-US/brand.properties @@ -0,0 +1,7 @@ +# 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/. + +#filter +brandShortName=Tor Browser +brandFullName=Tor Browser for Android diff --git a/mobile/android/branding/torbrowser/locales/jar.mn b/mobile/android/branding/torbrowser/locales/jar.mn new file mode 100644 index 000000000000..825dabbfb470 --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/jar.mn @@ -0,0 +1,11 @@ +#filter substitution +# 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/. + + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ +# Nightly branding only exists in en-US + locale/branding/brand.dtd (en-US/brand.dtd) +* locale/branding/brand.properties (en-US/brand.properties) diff --git a/mobile/android/branding/torbrowser/locales/moz.build b/mobile/android/branding/torbrowser/locales/moz.build new file mode 100644 index 000000000000..3bbe6729759c --- /dev/null +++ b/mobile/android/branding/torbrowser/locales/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +JAR_MANIFESTS += ['jar.mn'] diff --git a/mobile/android/branding/torbrowser/moz.build b/mobile/android/branding/torbrowser/moz.build new file mode 100644 index 000000000000..8f320daeae90 --- /dev/null +++ b/mobile/android/branding/torbrowser/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +DIRS += ['content', 'locales'] diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png new file mode 100644 index 000000000000..2a1dc9aea83d Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png new file mode 100644 index 000000000000..946e03e42d0b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png new file mode 100644 index 000000000000..4d7dc659a565 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png new file mode 100644 index 000000000000..78ace1c9b6d3 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png new file mode 100644 index 000000000000..8e45a100870b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png new file mode 100644 index 000000000000..23d966478fdf Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png new file mode 100644 index 000000000000..e4e84187e891 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png new file mode 100644 index 000000000000..8e45a100870b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png new file mode 100644 index 000000000000..d3a4929e7503 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png new file mode 100644 index 000000000000..beff04f1fc1d Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png new file mode 100644 index 000000000000..ef76eb342035 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png new file mode 100644 index 000000000000..946e03e42d0b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png new file mode 100644 index 000000000000..d3a4929e7503 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png new file mode 100644 index 000000000000..279af3fff38b Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png new file mode 100644 index 000000000000..d3a4929e7503 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png differ diff --git a/mobile/android/branding/torbrowser/torbrowser.png b/mobile/android/branding/torbrowser/torbrowser.png new file mode 100644 index 000000000000..6c6d906aa044 Binary files /dev/null and b/mobile/android/branding/torbrowser/torbrowser.png differ diff --git a/mobile/android/branding/torbrowser/torbrowser.xcf b/mobile/android/branding/torbrowser/torbrowser.xcf new file mode 100644 index 000000000000..2a8f829c3c34 Binary files /dev/null and b/mobile/android/branding/torbrowser/torbrowser.xcf differ diff --git a/testing/mozharness/mozharness/mozilla/testing/testbase.py b/testing/mozharness/mozharness/mozilla/testing/testbase.py index 558c629363f8..1e5c9507a2b3 100755 --- a/testing/mozharness/mozharness/mozilla/testing/testbase.py +++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py @@ -566,8 +566,11 @@ You can set this by: self._download_test_packages(suite_categories, extract_dirs) self._download_installer() - if self.config.get('download_symbols'): - self._download_and_extract_symbols() + # When using --disable-crashreporter the symbols file + # "target.crashreporter-symbols.zip" won't be created, + # so we shouldn't try downloading it (and fail). + #if self.config.get('download_symbols'): + # self._download_and_extract_symbols() # create_virtualenv is in VirtualenvMixin. [View Less]

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Move GCM Push prefs within preprocessor guard
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 75c6114151ff3f97595c51e75e07413d06da336a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sun Apr 15 14:19:38 2018 +0000 Bug 25741 - TBA: Move GCM Push prefs within preprocessor guard Otherwise the preprocessor is sad because MOZ_ANDROID_GCM_SENDERID is not defined. We don't need any of this, so we exclude it. --- mobile/android/app/mobile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/app/mobile.js b/mobile/… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits July 2018