November 2018 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Parse a set of strings in Android Set Preferences
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit b03bfc5100f3d255ae0116ab18653759f87fe241 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 19 14:25:27 2018 -0200 Bug 28507: Parse a set of strings in Android Set Preferences Android allows a set of String values in the preferences editor. However, the TBA distribution just supported simple scalar types. This patch implements the code to parse complex prefs from the distribution preference file. --- .../gecko/preferences/DistroSharedPrefsImport.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java index 13047c6f2ff4..7969aca3d2ac 100644 --- a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java +++ b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java @@ -11,10 +11,13 @@ import org.mozilla.gecko.distribution.Distribution; import android.content.Context; import android.content.SharedPreferences; import android.util.Log; +import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashSet; import java.util.Iterator; +import java.util.Set; public class DistroSharedPrefsImport { @@ -58,7 +61,21 @@ public class DistroSharedPrefsImport { } else if (value instanceof Long) { sharedPreferences.putLong(GeckoPreferences.NON_PREF_PREFIX + key, (long) value); } else { - Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file."); + JSONArray jsonArray = preferences.optJSONArray(key); + if (jsonArray != null) { + Set<String> prefValues = new HashSet<String>(); + for (int i = 0; i < jsonArray.length(); i++) { + try { + prefValues.add(jsonArray.getString(i)); + } catch (JSONException e) { + Log.e(LOGTAG, "Unable to parse Android Preferences.", e); + continue; + } + } + sharedPreferences.putStringSet(GeckoPreferences.NON_PREF_PREFIX + key, prefValues); + } else { + Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file."); + } } } sharedPreferences.apply();

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Add prefs that allow the browser to delete browsing history by default
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 57ef4c8201764f36e50347e913825c99ba2dc8bd Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 19 14:40:26 2018 -0200 Bug 28507: Add prefs that allow the browser to delete browsing history by default --- .../torbrowser/assets/distribution/preferences.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json index bebd14967d8e..0990fba37a8f 100644 --- a/mobile/android/torbrowser/assets/distribution/preferences.json +++ b/mobile/android/torbrowser/assets/distribution/preferences.json @@ -5,6 +5,18 @@ "AndroidPreferences": { "homepage": "about:tor", "startpane_enabled_after_57": true, - "startpane_enabled": true + "startpane_enabled": true, + "history.clear_on_exit": [ + "private.data.openTabs", + "private.data.history", + "private.data.searchHistory", + "private.data.formdata", + "private.data.cookies_sessions", + "private.data.cache", + "private.data.offlineApps", + "private.data.siteSettings", + "private.data.syncedTabs", + "private.data.passwords" + ] } }

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Implement fallback to delete private data in the browser startup
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 977e468c7f83b78cf920a7aa4943147eda195c45 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 19 14:58:15 2018 -0200 Bug 28507: Implement fallback to delete private data in the browser startup When the TBA is forcefully closed, its private data is not deleted, even if the history.clear_on_exit is set. As fallback, this patch calls the Sanitize:ClearData event in the browser startup to clean the private data if needed. --- .../android/base/java/org/mozilla/gecko/GeckoApp.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index ef7da17e19a1..3741c26fe0e8 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -564,10 +564,7 @@ public abstract class GeckoApp extends GeckoActivity return super.onOptionsItemSelected(item); } - private void quitAndClear() { - // Make sure the Guest Browsing notification goes away when we quit. - GuestSession.hideNotification(this); - + private GeckoBundle createSanitizeData() { final SharedPreferences prefs = getSharedPreferencesForProfile(); final Set<String> clearSet = PrefUtils.getStringSet( prefs, ClearOnShutdownPref.PREF, new HashSet<String>()); @@ -576,7 +573,14 @@ public abstract class GeckoApp extends GeckoActivity for (final String clear : clearSet) { clearObj.putBoolean(clear, true); } + return clearObj; + } + private void quitAndClear() { + // Make sure the Guest Browsing notification goes away when we quit. + GuestSession.hideNotification(this); + + final GeckoBundle clearObj = createSanitizeData(); final GeckoBundle res = new GeckoBundle(2); res.putBundle("sanitize", clearObj); @@ -1135,6 +1139,13 @@ public abstract class GeckoApp extends GeckoActivity mTextSelection.create(); final Bundle finalSavedInstanceState = savedInstanceState; + + // When the browser is forcefully closed, its private data is not + // deleted, even if the history.clear_on_exit is set. Here we are calling + // the Sanitize:ClearData in the startup to make sure the private + // data was cleared. + EventDispatcher.getInstance().dispatch("Sanitize:ClearData", createSanitizeData()); + ThreadUtils.postToBackgroundThread(new Runnable() { @Override public void run() {

1 0

[tor-browser-build/master] Build .apk files with distribution directory
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit f38b27734129d7a83f068e09ea1a1d07327622f5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 22 14:44:28 2018 +0000 Build .apk files with distribution directory Since #27111 landed we need a distributions directory to contain our additional preferences. Thus, we build now unconditionally with it. --- projects/firefox/mozconfig-android-armv7 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index f34e228..0098ea1 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -17,9 +17,7 @@ ac_add_options --with-branding=mobile/android/branding/torbrowser ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64 ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/bin/clang -if [ -n "${TB_BUILD_WITH_DISTRIBUTION}" ]; then - ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser -fi +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then # Because Google Play will likely be the primary distribution medium,

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25143_v2'
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit f2f4958d538fcb93bca387aa65bc833c7e143dcf Merge: 43c9452 a334a1a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 22 14:33:48 2018 +0000 Merge remote-tracking branch 'boklm/bug_25143_v2' rbm.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25143: avoid error if output file already exists
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit a334a1a59175e3e75b2a49fb02bc9206b838b727 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 19 19:29:52 2018 +0100 Bug 25143: avoid error if output file already exists If output file or directory already exists, remove it before moving it. This avoids an error when rebuilding a project that was already built. --- rbm.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 5e981ac..87fe179 100644 --- a/rbm.conf +++ b/rbm.conf @@ -401,7 +401,12 @@ runc: sudo chown -R $(whoami) "$srcdir" if [ $(ls -1 "$srcdir"/* 2> /dev/null | wc -l) -gt 0 ] then - mv -f "$srcdir"/* [% dst %]/ + for file in "$srcdir"/* + do + bname="$(basename "$file")" + test -e [% dst %]/"$bname" && rm -Rf [% dst %]/"$bname" + mv -f "$file" [% dst %]/ + done fi remote_finish: |

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27125 - Move localized Tor Browser for Android strings into separate file
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 970fcfe56478aa18fdeaf9ec902f016165dade62 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 20:56:22 2018 +0000 Bug 27125 - Move localized Tor Browser for Android strings into separate file Revert changed localized string we don't use anymore. --- .../android/base/locales/en-US/android_strings.dtd | 29 ++-------------------- .../base/locales/en-US/torbrowser_strings.dtd | 25 +++++++++++++++++++ mobile/android/base/locales/moz.build | 1 + mobile/android/base/strings.xml.in | 1 + .../mozbuild/action/generate_strings_xml.py | 3 ++- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index d7cded48fda4..bd55ce0a832f 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -4,8 +4,9 @@ <!ENTITY firstrun_panel_title_welcome "Welcome"> <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> -<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web."> +<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacy"> +  <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing."> <!ENTITY firstrun_panel_title_customize "Customize"> @@ -43,32 +44,6 @@ <!ENTITY firstrun_account_title "You"> <!ENTITY firstrun_account_message "Have &brandShortName; on another device?"> - -<!ENTITY firstrun_welcome_tab_title "Welcome"> -<!ENTITY firstrun_welcome_title "You\'re ready."> -<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> -<!ENTITY firstrun_welcome_next "Start now"> -<!ENTITY firstrun_privacy_tab_title "Privacy"> -<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> -<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> -<!ENTITY firstrun_privacy_next "Go to Tor Network"> -<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> -<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> -<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> -<!ENTITY firstrun_tornetwork_next "Next"> -<!ENTITY firstrun_secsettings_tab_title "Security"> -<!ENTITY firstrun_secsettings_title "Choose your experience."> -<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> -<!ENTITY firstrun_secsettings_next "Next"> -<!ENTITY firstrun_tips_tab_title "Tips"> -<!ENTITY firstrun_tips_title "Experience Tips."> -<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> -<!ENTITY firstrun_tips_next "Next"> -<!ENTITY firstrun_onionservices_tab_title "Onions"> -<!ENTITY firstrun_onionservices_title "Onion Services."> -<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> -<!ENTITY firstrun_onionservices_next "Go to explore"> - <!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;.">  +<!ENTITY firstrun_welcome_tab_title "Welcome"> +<!ENTITY firstrun_welcome_title "You\'re ready."> +<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> +<!ENTITY firstrun_welcome_next "Start now"> +<!ENTITY firstrun_privacy_tab_title "Privacy"> +<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> +<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> +<!ENTITY firstrun_privacy_next "Go to Tor Network"> +<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> +<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> +<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> +<!ENTITY firstrun_tornetwork_next "Next"> +<!ENTITY firstrun_secsettings_tab_title "Security"> +<!ENTITY firstrun_secsettings_title "Choose your experience."> +<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> +<!ENTITY firstrun_secsettings_next "Next"> +<!ENTITY firstrun_tips_tab_title "Tips"> +<!ENTITY firstrun_tips_title "Experience Tips."> +<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> +<!ENTITY firstrun_tips_next "Next"> +<!ENTITY firstrun_onionservices_tab_title "Onions"> +<!ENTITY firstrun_onionservices_title "Onion Services."> +<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> +<!ENTITY firstrun_onionservices_next "Go to explore"> diff --git a/mobile/android/base/locales/moz.build b/mobile/android/base/locales/moz.build index 81edbea9425b..d863a3cc5680 100644 --- a/mobile/android/base/locales/moz.build +++ b/mobile/android/base/locales/moz.build @@ -65,4 +65,5 @@ for f in ['../res/values/strings.xml', # The `en-US/` will be rewritten to the locale-specific path. 'en-US/android_strings.dtd', 'en-US/sync_strings.dtd', + 'en-US/torbrowser_strings.dtd', ] diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index cfc7b5a137f8..2beb152ad5bb 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -8,6 +8,7 @@ #includesubst @BRANDPATH@ #includesubst @STRINGSPATH@ #includesubst @SYNCSTRINGSPATH@ +#includesubst @TBSTRINGSPATH@  <!ENTITY formatI "%I"> diff --git a/python/mozbuild/mozbuild/action/generate_strings_xml.py b/python/mozbuild/mozbuild/action/generate_strings_xml.py index b60b480f0748..0b3ca6efb229 100644 --- a/python/mozbuild/mozbuild/action/generate_strings_xml.py +++ b/python/mozbuild/mozbuild/action/generate_strings_xml.py @@ -11,7 +11,7 @@ import buildconfig from mozbuild import preprocessor -def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None): +def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, torbrowser_strings_dtd, locale=None): if not locale: raise ValueError('locale must be specified!') @@ -23,6 +23,7 @@ def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None # Includes. defines['STRINGSPATH'] = android_strings_dtd defines['SYNCSTRINGSPATH'] = sync_strings_dtd + defines['TBSTRINGSPATH'] = torbrowser_strings_dtd # Fennec branding is en-US only: see # $(MOZ_BRANDING_DIRECTORY)/locales/jar.mn. defines['BRANDPATH'] = '{}/{}/locales/en-US/brand.dtd'.format(

1 0

[tor-browser-build/master] Bug 26843: add projects/firefox-locale-bundle
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 43c9452946313a5ab3dd064501daa05096db86eb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 19 13:04:54 2018 +0100 Bug 26843: add projects/firefox-locale-bundle projects/firefox-locale-bundle will clone or pull the mercurial repositories for each locale into the hg_clones/firefox-locale-bundle directory, and generate tarballs using the changesets listed in the firefox json file. The script get_hg_hash is used to parse this json file and output the hg changeset for the selected locale. Patch based on work started by GeKo. --- README | 9 ++++++--- projects/firefox-locale-bundle/build | 29 +++++++++++++++++++++++++++++ projects/firefox-locale-bundle/config | 12 ++++++++++++ projects/firefox-locale-bundle/get_hg_hash | 21 +++++++++++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/README b/README index a20b659..8ebef9b 100644 --- a/README +++ b/README @@ -14,8 +14,10 @@ to extract container file systems, start containers and copy files to and from containers. The sources of most components are downloaded using git, which needs to -be installed. The sources of webrtc are downloaded using gclient, which -requires GTK+ 2.0 development files and curl to be installed. +be installed. Some components are downloaded using mercurial which also +needs to be installed. The sources of webrtc are downloaded using +gclient, which requires GTK+ 2.0 development files and curl to be +installed. You also need a few perl modules installed: - YAML::XS @@ -41,7 +43,8 @@ If you are running Debian or Ubuntu, you can install them with: libio-captureoutput-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - libfile-copy-recursive-perl git libgtk2.0-dev curl runc + libfile-copy-recursive-perl git libgtk2.0-dev curl runc \ + mercurial The build system is based on rbm, which is included as a git submodule in the rbm/ directory. You can fetch the rbm git submodule by running diff --git a/projects/firefox-locale-bundle/build b/projects/firefox-locale-bundle/build new file mode 100644 index 0000000..3fec48e --- /dev/null +++ b/projects/firefox-locale-bundle/build @@ -0,0 +1,29 @@ +#!/bin/bash + +[% c("var/set_default_env") -%] + +clone_dir='[% c("basedir") %]/hg_clones/[% project %]' +mkdir -p "$clone_dir" +cd "$clone_dir" +tmpdir=$(mktemp -d) + +[% FOREACH lang = c('var/locales') %] + [% SET lang = tmpl(lang); + SET hgurl = "https://hg.mozilla.org/l10n-central/" _ lang %] + if test -d [% lang %] + then + cd [% lang %] + [% c("hg") %] pull [% hgurl %] + else + [% c("hg") %] clone [% hgurl %] [% lang %] + cd [% lang %] + fi + hg_hash=$([% c("basedir") %]/projects/firefox-locale-bundle/get_hg_hash \ + $rootdir/[% c('input_files_by_name/firefox_json') %] \ + [% lang %]) + [% c("hg") %] archive -r "$hg_hash" -t files "$tmpdir"/[% lang %] + cd .. +[% END %] + +tar -C "$tmpdir" -czf [% dest_dir %]/[% c("filename") %] . +rm -Rf "$tmpdir" diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config new file mode 100644 index 0000000..13c5fb8 --- /dev/null +++ b/projects/firefox-locale-bundle/config @@ -0,0 +1,12 @@ +# vim: filetype=yaml sw=2 +version: '[% c("var/ff_version") %]-[% c("var/ff_build") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' + +var: + use_container: 0 + ff_version: '[% pc("firefox", "var/firefox_version") %]' + ff_build: build1 + +input_files: + - name: firefox_json + URL: 'https://product-details.mozilla.org/1.0/l10n/Firefox-[% c("var/ff_version") %]-[% c("var/ff_build") %].json' diff --git a/projects/firefox-locale-bundle/get_hg_hash b/projects/firefox-locale-bundle/get_hg_hash new file mode 100755 index 0000000..0531113 --- /dev/null +++ b/projects/firefox-locale-bundle/get_hg_hash @@ -0,0 +1,21 @@ +#!/usr/bin/perl -w +use strict; +use File::Slurp; +use JSON; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + exit (exists $_[1] ? $_[1] : 1); +} + +exit_error("Wrong number of arguments", 1) unless @ARGV == 2; + +my ($file, $locale) = @ARGV; +my $json_text = read_file($file); +exit_error("Error reading $file", 2) unless defined $json_text; + +my $data = decode_json($json_text); + +my $changeset = $data->{locales}{$locale}{changeset}; +exit_error("Can't find locale $locale in $file", 3) unless $changeset; +print "$changeset\n";

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Update Torbutton submodule
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 9a300eedd12c23e1ce48484816df00f4c1a77033 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 21 22:21:36 2018 +0000 Update Torbutton submodule --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index ac8d92514940..a41034ced7a6 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd +Subproject commit a41034ced7a6c0fe590320d9da61d15df1fef42f

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27111: Configure tor browser for mobile to load about:tor
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit c0c87e1a9a6573ac480e4b46d232a4b451f6475c Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu Nov 15 07:33:54 2018 -0200 Bug 27111: Configure tor browser for mobile to load about:tor - Add preferences.json: it is used to configure android specific preferences - Keep the ActivityStream HomePager closed when the user clicks in the url bar --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 2 -- mobile/android/torbrowser/assets/distribution/preferences.json | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 4a497f6999e0..5efd83398775 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -2734,8 +2734,6 @@ public class BrowserApp extends GeckoApp mBrowserToolbar.startEditing(url, animator); - showHomePagerWithAnimator(panelId, null, animator); - animator.start(); Telemetry.startUISession(TelemetryContract.Session.AWESOMESCREEN); } diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json new file mode 100644 index 000000000000..bebd14967d8e --- /dev/null +++ b/mobile/android/torbrowser/assets/distribution/preferences.json @@ -0,0 +1,10 @@ +{ + "ApplicationPreferences": { + "newtab.load_homepage": true + }, + "AndroidPreferences": { + "homepage": "about:tor", + "startpane_enabled_after_57": true, + "startpane_enabled": true + } +}

1 0