- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_29158_v4'
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit 15e8c5389b76e5fd8634a35c5bff1a5a7192a818 Merge: eb0e8e0 f9cbcb9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 07:58:13 2019 +0000 Merge remote-tracking branch 'boklm/bug_29158_v4' projects/debootstrap-image/config | 79 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)

1 0

[tor-browser-build/master] Bug 27503: Adapt mozconfig files to enable accessibility on Windows
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit c4ba9b5e6a38971aad6e6d8331e16e7b3a773f1e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 22 10:58:41 2019 +0000 Bug 27503: Adapt mozconfig files to enable accessibility on Windows When bumping mingw-w64 for the crash fix in #28874 we forgot to adapt our Windows mozconfig files to take into account that we don't need to define CXXFLAGS anymore. The changes landed in commit a91a7e405752bbdbe39101f7aaeb1e1d932199db in the mingw-w64 repo. --- projects/firefox/mozconfig-windows-i686 | 3 --- projects/firefox/mozconfig-windows-x86_64 | 3 --- 2 files changed, 6 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 07e8851..4045ce0 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -1,8 +1,5 @@ CROSS_COMPILE=1 -# https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 -export CXXFLAGS="-DWIDL_EXPLICIT_AGGREGATE_RETURNS" - ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 ac_add_options --with-toolchain-prefix=i686-w64-mingw32- diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 1665005..9b757ea 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -1,8 +1,5 @@ CROSS_COMPILE=1 -# https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 -export CXXFLAGS="-DWIDL_EXPLICIT_AGGREGATE_RETURNS" - ac_add_options --enable-application=browser ac_add_options --target=x86_64-w64-mingw32 ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-

1 0

[tor-browser-build/master] Bug 27503: Adapt mozconfig files to enable accessibility on Windows
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit eb0e8e0d13c4325a7af1e469cce307fed8e122ee Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 22 11:03:53 2019 +0000 Bug 27503: Adapt mozconfig files to enable accessibility on Windows --- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - 2 files changed, 2 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 4045ce0..3314719 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -26,5 +26,4 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-stylo # Bugzilla 1390583 -ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/ ac_add_options --disable-jemalloc # Bugzilla 1466192 diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 9b757ea..62e32c5 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -26,5 +26,4 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-stylo # Bugzilla 1390583 -ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/ ac_add_options --disable-jemalloc # Bugzilla 1466192

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 12885: Windows Jump Lists fail for Tor Browser
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit f4606d1c1c35eb36edf3c7cd6b2904be01f19f32 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jan 25 07:51:14 2019 +0000 Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. --- browser/app/profile/000-tor-browser.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 2b238dd87c1b..11027f4c9a3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -326,6 +326,18 @@ pref("browser.onboarding.newtour", "welcome,privacy,tor-network,circuit-display, pref("browser.onboarding.updatetour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services"); pref("browser.onboarding.skip-tour-button.hide", true); +// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) +#ifdef XP_WIN +// this pref changes the app's set AUMID to be dependent on the profile path, rather than +// attempting to read it from the registry; this is necessary so that the file generated +// by the jumplist system can be properly deleted if it is disabled +pref("taskbar.grouping.useprofile", true); +pref("browser.taskbar.lists.enabled", false); +pref("browser.taskbar.lists.frequent.enabled", false); +pref("browser.taskbar.lists.tasks.enabled", false); +pref("browser.taskbar.lists.recent.enabled", false); +#endif + #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit b5793205da5fde6035f1bb7c49752fd38a9ed6e9 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 17 06:48:47 2018 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 27597: ASan build option in tor-browser-build is broken --- .mozconfig-asan | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index be11dcbd967a..4fde71a0b1e3 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -1,15 +1,15 @@ . $topsrcdir/browser/config/mozconfig -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" # We need to add -ldl explicitely due to bug 1213698 export LDFLAGS="-fsanitize=address -ldl" # Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff # (which is part of mar-tools and is not distributed to end-users) with # ASan. See bug 17858. -export HOST_CFLAGS="-fwrapv" -export HOST_CXXFLAGS="-fwrapv" +export HOST_CFLAGS="" +export HOST_CXXFLAGS="" export HOST_LDFLAGS="-ldl" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 27597: Package dom_bindings_test only with tests enabled
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit 2d5a66c40885598133593c641fd8401a0b2f2fac Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 15 19:52:32 2018 +0000 Bug 27597: Package dom_bindings_test only with tests enabled --- browser/installer/package-manifest.in | 2 +- mobile/android/installer/package-manifest.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 7c89a4f70b95..fadf205c229c 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -197,7 +197,7 @@ @RESPATH@/components/dom.xpt @RESPATH@/components/dom_base.xpt @RESPATH@/components/dom_bindings.xpt -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) @RESPATH@/components/dom_bindings_test.xpt #endif @RESPATH@/components/dom_file.xpt diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 69714f9eca7c..7fe0e97c2d3b 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -118,7 +118,7 @@ @BINPATH@/components/dom.xpt @BINPATH@/components/dom_base.xpt @BINPATH@/components/dom_bindings.xpt -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) @BINPATH@/components/dom_bindings_test.xpt #endif @BINPATH@/components/dom_core.xpt

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 27597: Package layout debugger interface only if tests are enabled
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit 3723fd7b92f17ed857cea9bacb26b77fa4d34efc Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 15 19:55:45 2018 +0000 Bug 27597: Package layout debugger interface only if tests are enabled --- browser/installer/package-manifest.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index fadf205c229c..ede92eca6e58 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -242,7 +242,7 @@ @RESPATH@/components/jsdebugger.xpt @RESPATH@/browser/components/jsinspector.xpt @RESPATH@/components/layout_base.xpt -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) @RESPATH@/components/layout_debug.xpt #endif #ifdef NS_PRINTING

1 0

[tor-browser-build/master] Bug 29143: fix build of obfs4 in nightly builds
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit f27f11201d86b8bb909bad8b4c04f841b5487ddb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 22 13:31:23 2019 +0100 Bug 29143: fix build of obfs4 in nightly builds --- projects/goptlib/config | 5 +++++ projects/goutls/config | 21 +++++++++++++++++++++ projects/goxcrypto/config | 8 +++++++- projects/goxsys/config | 19 +++++++++++++++++++ projects/goxtext/config | 18 ++++++++++++++++++ projects/obfs4/build | 4 ++++ projects/obfs4/config | 6 ++++++ projects/siphash/config | 2 +- 8 files changed, 81 insertions(+), 2 deletions(-) diff --git a/projects/goptlib/config b/projects/goptlib/config index c083763..2fd51f8 100644 --- a/projects/goptlib/config +++ b/projects/goptlib/config @@ -13,6 +13,11 @@ var: use_container: 1 go_lib: git.torproject.org/pluggable-transports/goptlib.git +targets: + nightly: + version: master + tag_gpg_id: 0 + input_files: - project: container-image - name: go diff --git a/projects/goutls/config b/projects/goutls/config new file mode 100644 index 0000000..bdd5273 --- /dev/null +++ b/projects/goutls/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/refraction-networking/utls +git_hash: a89e7e6da482a5a0db02578fc606ace9ccfbea62 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/refraction-networking/utls + go_lib_deps: + - goxcrypto + +input_files: + - project: container-image + - name: go + project: go + - name: goxcrypto + project: goxcrypto diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index b51b578..fe73f93 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: 4ed45ec682102c643324fae5dff8dab085b6c300 +git_hash: ff983b9c42bc9fbf91556e191cc8efb585c16908 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,9 +11,13 @@ var: use_container: 1 go_lib: golang.org/x/crypto go_lib_install: + - golang.org/x/crypto/chacha20poly1305 + - golang.org/x/crypto/cryptobyte - golang.org/x/crypto/curve25519 - golang.org/x/crypto/hkdf - golang.org/x/crypto/nacl/secretbox + go_lib_deps: + - goxsys targets: nightly: @@ -23,3 +27,5 @@ input_files: - project: container-image - name: go project: go + - name: goxsys + project: goxsys diff --git a/projects/goxsys/config b/projects/goxsys/config new file mode 100644 index 0000000..64a7213 --- /dev/null +++ b/projects/goxsys/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/sys +git_hash: 11f53e03133963fb11ae0588e08b5e0b85be8be5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/sys + go_lib_install: + - golang.org/x/sys/cpu + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goxtext/config b/projects/goxtext/config new file mode 100644 index 0000000..fba619f --- /dev/null +++ b/projects/goxtext/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/text +# v0.3.0 +git_hash: f21a4dfb5e38f5895301dc265a8def02365cc3d0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/text + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/obfs4/build b/projects/obfs4/build index 4e42b23..dedd1ef 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -11,6 +11,10 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] +[% IF c("var/nightly") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/obfs4/config b/projects/obfs4/config index 2bae851..2c94f10 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -32,3 +32,9 @@ input_files: project: goxcrypto - name: goxnet project: goxnet + - name: goutls + project: goutls + enable: '[% c("var/nightly") %]' + - name: goxtext + project: goxtext + enable: '[% c("var/nightly") %]' diff --git a/projects/siphash/config b/projects/siphash/config index b2cb2a9..7e40bc7 100644 --- a/projects/siphash/config +++ b/projects/siphash/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/dchest/siphash.git -git_hash: 42ba037e748c9062a75e0924705c43b893edefcd +git_hash: 34f201214d993633bb24f418ba11736ab8b55aa7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]'

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1484472 - Avoid FileUriExposedException in ExternalIntentDuringPrivateBrowsingPromptFragment. r=jchen
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit 17314deba4ef021723dbb67d3e31af33790a5147 Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Wed Aug 22 16:50:04 2018 +0000 Bug 1484472 - Avoid FileUriExposedException in ExternalIntentDuringPrivateBrowsingPromptFragment. r=jchen The fragment is also used to handle intents launched through GeckoAppShell. openUriExternal(), such as e.g. when launching downloaded files from about:downloads. The synchronous code path when not in private browsing is already covered by the code added in bug 1450449, but the async path through the fragment when in private browsing needs to be handled separately. Differential Revision: https://phabricator.services.mozilla.com/D3916 --HG-- extra : moz-landing-system : lando --- .../ExternalIntentDuringPrivateBrowsingPromptFragment.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java b/mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java index b4d1e13d9698..6dd8ae92c854 100644 --- a/mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java @@ -17,6 +17,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.os.StrictMode; import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentManager; import android.support.v7.app.AlertDialog; @@ -25,9 +26,9 @@ import android.util.Log; import java.util.List; /** - * A DialogFragment to contain a dialog that appears when the user clicks an Intent:// URI during private browsing. The - * dialog appears to notify the user that a clicked link will open in an external application, potentially leaking their - * browsing history. + * A DialogFragment to contain a dialog that appears when the user clicks an Intent:// URI or + * launches a file during private browsing. The dialog appears to notify the user that a clicked + * link will open in an external application, potentially leaking their browsing history. */ public class ExternalIntentDuringPrivateBrowsingPromptFragment extends DialogFragment { private static final String LOGTAG = ExternalIntentDuringPrivateBrowsingPromptFragment.class.getSimpleName(); @@ -50,7 +51,13 @@ public class ExternalIntentDuringPrivateBrowsingPromptFragment extends DialogFra .setTitle(intent.getDataString()) .setPositiveButton(R.string.button_yes, new DialogInterface.OnClickListener() { public void onClick(final DialogInterface dialog, final int id) { + // Bug 1450449 - Downloaded files are already in a public directory and + // aren't really exclusively owned by Firefox, so there's no real benefit + // to using content:// URIs here. + StrictMode.VmPolicy prevPolicy = StrictMode.getVmPolicy(); + StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX); context.startActivity(intent); + StrictMode.setVmPolicy(prevPolicy); } }) .setNegativeButton(R.string.button_no, null /* we do nothing if the user rejects */ );

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1450449 - Part 4: Starting from Nougat, install updates via content:// URIs. r=jchen
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit 3b926685447ea2056e73d9b3396ea8d5cbdd349f Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Sat May 12 23:34:25 2018 +0200 Bug 1450449 - Part 4: Starting from Nougat, install updates via content:// URIs. r=jchen We download the update APK into the public downloads directory and normally the only relevant app consuming that URI should be the system package installer, but just to be safe we only switch usage from Nougat onward, too. MozReview-Commit-ID: GtoXMJ7NdJ3 --HG-- extra : rebase_source : 1e85f8352b7a59cb3cd2fd3034a0103c8705ff09 --- .../base/java/org/mozilla/gecko/updater/UpdateService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java index 71e1097711d9..d5093efca6d6 100644 --- a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java +++ b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java @@ -36,6 +36,7 @@ import android.os.Environment; import android.provider.Settings; import android.support.v4.app.NotificationManagerCompat; import android.support.v4.content.ContextCompat; +import android.support.v4.content.FileProvider; import android.support.v4.net.ConnectivityManagerCompat; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Builder; @@ -707,8 +708,15 @@ public class UpdateService extends IntentService { } Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setDataAndType(Uri.fromFile(updateFile), "application/vnd.android.package-archive"); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + if (AppConstants.Versions.preN) { + intent.setDataAndType(Uri.fromFile(updateFile), "application/vnd.android.package-archive"); + } else { + Uri apkUri = FileProvider.getUriForFile(this, + AppConstants.MOZ_FILE_PROVIDER_AUTHORITY, updateFile); + intent.setDataAndType(apkUri, "application/vnd.android.package-archive"); + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + } + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); }

1 0