- tbb-commits - lists.torproject.org

[torbutton/master] Bug 28540: Use new text for 2018 donation banner
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 4ad39b362dd7692b5e24841c616f63a5ca2bc67a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 17:25:48 2018 -0800 Bug 28540: Use new text for 2018 donation banner --- src/chrome/content/aboutTor/aboutTor-content.js | 2 +- src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++--------- src/chrome/content/torbutton.js | 2 +- src/defaults/preferences/preferences.js | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index d34bbe5c..e53266bd 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -72,7 +72,7 @@ var AboutTorListener = { sendAsyncMessage(that.kAboutTorHideDonationBanner); }); }); - bindPrefAndInit("extensions.torbutton.donation_banner_countdown", + bindPrefAndInit("extensions.torbutton.donation_banner_countdown2", countdown => { if (content.document && content.document.body) { content.document.body.setAttribute( diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 94dd13f3..5f5fccdc 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,15 +37,17 @@ window.addEventListener("pageshow", function() { <div id="donation-banner-lines"> <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> <div id="donation-banner-line2" - data-0="&aboutTor.donationBanner.line2a;" - data-1="&aboutTor.donationBanner.line2b;" - data-2="&aboutTor.donationBanner.line2c;" - data-3="&aboutTor.donationBanner.line2d;" - data-4="&aboutTor.donationBanner.line2e;" - data-5="&aboutTor.donationBanner.line2f;"> - &aboutTor.donationBanner.line2a; + data-6="&aboutTor.donationBanner.line2e;" + data-7="&aboutTor.donationBanner.line2f;" + data-8="&aboutTor.donationBanner.line2g;" + data-9="&aboutTor.donationBanner.line2h;" + data-10="&aboutTor.donationBanner.line2i;" + data-11="&aboutTor.donationBanner.line2j;"> + &aboutTor.donationBanner.line2e; </div> - <div id="donation-banner-line3">&aboutTor.donationBanner.line3;</div> + <div id="donation-banner-line3" + data-b="&aboutTor.donationBanner.line3b;"> + &aboutTor.donationBanner.line3;</div> <a id="donation-banner-button" href="https://www.torproject.org/donate/donate-sin-tbd0-0" type="button" @@ -58,13 +60,17 @@ window.addEventListener("pageshow", function() { </div> <script type="text/javascript"> <![CDATA[ - let lineChoice = Math.floor(Math.random() * 6); + let lineChoice = 6 + Math.floor(Math.random() * 6); let line2 = document.getElementById("donation-banner-line2"); let line2text = line2.getAttribute(`data-${lineChoice}`); let line2pieces = line2text.split(" "); let line2end = '<span>' + line2pieces.pop() + '</span>'; line2pieces.push(line2end); line2.innerHTML = line2pieces.join(" "); + line3 = document.getElementById("donation-banner-line3"); + if (lineChoice === 11) { + line3.innerHTML = line3.getAttribute("data-b"); + } let buttonChoice = Math.floor(Math.random() * 2); let button = document.getElementById("donation-banner-button"); button.innerHTML = button.getAttribute(`data-${buttonChoice}`); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ee13f461..8bd847f9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -17,7 +17,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown2"; var m_tb_prefs = Services.prefs; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 9beb3993..eb055a65 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.donation_banner_countdown", 12); +pref("extensions.torbutton.donation_banner_countdown2", 12); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[tor-browser-build/master] Update OpenSSL to 1.0.2q
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 30c764db2bbbde93ebee67e2b190a4d9c88873b9 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 3 08:06:40 2018 +0000 Update OpenSSL to 1.0.2q --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index d3ed959..e91e820 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2p +version: 1.0.2q filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 + sha256sum: 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684

1 0

[tor-browser-build/master] Tagging build2
by gk＠torproject.org 01 Dec '18

01 Dec '18

commit c1667c29be45ba7296dae3e268115137c4f687a5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 1 13:50:15 2018 +0000 Tagging build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 5d1d861..0d53855 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 28677: Copy all the bundles for our releases
by gk＠torproject.org 01 Dec '18

01 Dec '18

commit e9a2fc5a9d9ee5571ca6daf94ac367e14732cd50 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 1 13:33:54 2018 +0000 Bug 28677: Copy all the bundles for our releases --- projects/release/build | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 2c9912f..e7c7410 100644 --- a/projects/release/build +++ b/projects/release/build @@ -6,7 +6,6 @@ destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" [% IF c("var/torbrowser-android-armv7") -%] mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ - [% RETURN %] [% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/

1 0

[tor-browser-build/master] Release preparations for 8.5a5
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 7b2b5ae4bac7863075fac61259328c9577e87475 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 30 07:28:43 2018 +0000 Release preparations for 8.5a5 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 58 ++++++++++++++++++++++ projects/tor-browser/config | 4 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 6 +-- 8 files changed, 68 insertions(+), 10 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 68918d9..81416a2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index e189eb9..b0b3ce9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.9.19 +version: 2018.10.31 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3bd05ed..5c3732b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,61 @@ +Tor Browser 8.5a5 -- December 3 2018 + * All Platforms + * Update Torbutton to 2.1.2 + * Bug 25013: Integrate Torbutton into tor-browser for Android + * Bug 27111: Update about:tor desktop version to work on mobile + * Bug 28093: Update donation banner style to make it fit in small screens + * Bug 28543: about:tor has scroll bar between widths 900px and 1000px + * Bug 28039: Enable dump() if log method is 0 + * Bug 27701: Don't show App Blocker dialog on Android + * Bug 28187: Change tor circuit icon to torbutton.svg + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + * Update Tor Launcher to 0.2.18 + * Bug 28039: Enable dump() if log method is 0 + * Translations update + * Update HTTPS Everywhere to 2018.10.31 + * Update NoScript to 10.2.0 + * Bug 22343: Make 'Save Page As' obey first-party isolation + * Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading + * Windows + * Update Tor to 0.3.5.5-alpha + * Bug 28310: Don't build obfs4 with module versioning support + * Bug 27827: Update Go to 1.11.1 + * Bug 28185: Add smallerRichard to Tor Browser + * Bug 28657: Remove broken FTE bridge from Tor Browser + * OS X + * Update Tor to 0.3.5.5-alpha + * Bug 28310: Don't build obfs4 with module versioning support + * Bug 27827: Update Go to 1.11.1 + * Bug 27827: Build snowflake reproducibly + * Bug 28258: Don't look for webrtc headers under talk/ + * Bug 28185: Add smallerRichard to Tor Browser + * Linux + * Update Tor to 0.3.5.5-alpha + * Bug 28310: Don't build obfs4 with module versioning support + * Bug 27827: Update Go to 1.11.1 + * Bug 27827: Build snowflake reproducibly + * Bug 28258: Don't look for webrtc headers under talk/ + * Bug 28185: Add smallerRichard to Tor Browser + * Bug 28657: Remove broken FTE bridge from Tor Browser + * Android + * Bug 28051: Fix up Orbot for inclusion into Tor Browser + * Bug 26690+25765: Port padlock states for .onion serices to mobile + * Bug 28507: Delete private data in the browser startup + * Bug 27111+25013: Configure Tor Browser for mobile to load about:tor + * Bug 27256: Enable TouchEvents on Android + * Bug 28640: Use system add-on and distributed preferences + * Build System + * Bug 27977: Build Orbot inside tor-browser-build + * Bug 27443: Update Firefox RBM config and build for Android + * Bug 27439: Add android target for rust compiler + * Bug 28469: Fix unsupported libbacktrace in Rust 1.26 + * Bug 28468: Modify Android toolchain to support Orbot + * Bug 28483: Modify Android Toolchain API Version + * Bug 28472: Add Android Makefile Rules + * Bug 28470: Add fetch gradle dependency script to common project + * Bug 28144: Update projects/tor-browser for Android + Tor Browser 8.5a4 -- October 23 2018 * All Platforms * Update Firefox to 60.3.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e4e3a03..149b800 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -84,9 +84,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 + sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index ff5b387..4f2d2b7 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.17 +version: 0.2.18 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index cc6df23..4ba18d9 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.5.3-alpha +version: 0.3.5.5-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index b4d50be..2e48f31 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.1 +version: 2.1.2 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 87fe179..5d1d861 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a4' - torbrowser_build: 'build2' + torbrowser_version: '8.5a5' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a3 + - 8.5a4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 28185: Add smallerRichard to Tor Browser
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 03883ab8278cbc49deee0ee3285a2de4d215a929 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 29 16:15:07 2018 +0000 Bug 28185: Add smallerRichard to Tor Browser --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index ec76ce7..f58eb02 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -39,6 +39,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:3822 pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.28", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Picking up latest Torbutton commits
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 8bc2ca14f51f4b57efcadd6f7405e0a4d48f2204 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 30 07:22:59 2018 +0000 Picking up latest Torbutton commits --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index a41034ced7a6..68ad9e3d555d 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit a41034ced7a6c0fe590320d9da61d15df1fef42f +Subproject commit 68ad9e3d555d18d894c2ae0a1e8b3e797642ff54

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28640: Reload distribution preferences when a new version of the app is installed
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 20f13426dec48e7b3b1df2cbd6cc41b3432fa267 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 20:33:14 2018 +0000 Bug 28640: Reload distribution preferences when a new version of the app is installed --- .../base/java/org/mozilla/gecko/distribution/Distribution.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java index ea9534bfd741..93c325e451bd 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -43,7 +43,9 @@ import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoApplication; import org.mozilla.gecko.GeckoSharedPrefs; +import org.mozilla.gecko.preferences.DistroSharedPrefsImport; import org.mozilla.gecko.Telemetry; +import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.FileUtils; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.HardwareUtils; @@ -246,6 +248,7 @@ public class Distribution { final String preferencesJSON = FileUtils.readStringFromFile(descFile); data = new GeckoBundle(1); data.putString("preferences", preferencesJSON); + DistroSharedPrefsImport.importPreferences(distribution.context, distribution); } catch (IOException e) { Log.e(LOGTAG, "Error getting distribution descriptor file.", e); @@ -498,6 +501,13 @@ public class Distribution { // We've done the work once; don't do it again. if (this.state == STATE_SET) { + // If this is a new version of the app, then copy the + // distribution files from the APK + if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { + Log.i(LOGTAG, "Copying APK distribution file because the build ID changed."); + copyAndCheckAPKDistribution(); + } + // Note that we don't compute the distribution directory. // Call `ensureDistributionDir` if you need it. runReadyQueue();

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28640: Try showing the homepage after the distribution loads
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit bd3d1614a144377b32f5f548ce235c8ae0fb01d8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 23:44:43 2018 +0000 Bug 28640: Try showing the homepage after the distribution loads --- .../base/java/org/mozilla/gecko/BrowserApp.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 814b46f24295..9330a6ba9838 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3155,6 +3155,29 @@ public class BrowserApp extends GeckoApp // Don't show any onFinish actions when hiding from this Activity. mFirstrunAnimationContainer.registerOnFinishListener(null); mFirstrunAnimationContainer.hide(); + + // This is a little hacky, but this ensures about:tor (or whichever homepage + // is configured) shows when the user closes the FirstRun panels. + String homepageUrl = Tabs.getHomepage(BrowserApp.this); + + // If the homepage is already open in one of the tabs, then switch to that tab. + int homepage_index = Tabs.getInstance().isOpen(homepageUrl); + if (homepage_index != Tabs.INVALID_TAB_ID) { + Tabs.getInstance().selectTab(homepage_index); + return true; + } + + // Open in the currently selected tab by default + int tab_flags = Tabs.LOADURL_NONE; + + // If there's more than one tab open, then the user opened at least one of them. + // Don't modify their tabs and open a new tab for the homepage. + if (Tabs.getInstance().getDisplayCount() > 1) { + tab_flags = Tabs.LOADURL_NEW_TAB; + } + + Tabs.getInstance().loadUrl(homepageUrl, tab_flags); + return true; }

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28640: Do not load Torbutton from the user's profile (only on Android)
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 62ec69b09ff02649b3eab64a08fa87549c0bfc16 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Nov 30 07:05:05 2018 +0000 Bug 28640: Do not load Torbutton from the user's profile (only on Android) --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 11 +++++++++++ toolkit/mozapps/extensions/internal/moz.build | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index a8be063ddbde..f9e48977053e 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1601,6 +1601,17 @@ var XPIStates = { for (let [id, file] of location.getAddonLocations(true)) { knownIds.delete(id); +#if defined(TOR_BROWSER_VERSION) && defined(ANDROID) + // Remove Torbutton if it is installed in the user profile + if (id === "torbutton(a)torproject.org" && + location.name === KEY_APP_PROFILE) { + logger.debug("Uninstalling Torbutton from user profile."); + location.uninstallAddon(id); + changed = true; + continue; + } +#endif + let xpiState = loc.get(id); if (!xpiState) { logger.debug("New add-on ${id} in ${location}", {id, location: location.name}); diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build index 8661ef7125dd..32b75a5cef68 100644 --- a/toolkit/mozapps/extensions/internal/moz.build +++ b/toolkit/mozapps/extensions/internal/moz.build @@ -15,10 +15,13 @@ EXTRA_JS_MODULES.addons += [ 'ProductAddonChecker.jsm', 'SpellCheckDictionaryBootstrap.js', 'XPIInstall.jsm', - 'XPIProvider.jsm', 'XPIProviderUtils.js', ] +EXTRA_PP_JS_MODULES.addons += [ + 'XPIProvider.jsm', +] + TESTING_JS_MODULES += [ 'AddonTestUtils.jsm', ]

1 0