From 4c7bdbb284e7d28f83a9a9ff7bcd52e583f05850 Mon Sep 17 00:00:00 2001 From: Wang Han <416810799@qq.com> Date: Sun, 26 Mar 2017 23:55:11 +0800 Subject: [PATCH] Fix crashing when selecting release notes on some devices --- .../main/java/com/topjohnwu/magisk/InstallFragment.java | 6 +++++- app/src/main/java/com/topjohnwu/magisk/utils/Utils.java | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java b/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java index e8522140a..65340c2e6 100644 --- a/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java @@ -100,7 +100,11 @@ public class InstallFragment extends Fragment implements CallbackEvent.Listener< magiskManager.magiskLink, Utils.getLegalFilename(filename))) .setNeutralButton(R.string.release_notes, (dialog, which) -> { - magiskManager.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(magiskManager.releaseNoteLink))); + if (magiskManager.releaseNoteLink != null) { + Intent openReleaseNoteLink = new Intent(Intent.ACTION_VIEW, Uri.parse(magiskManager.releaseNoteLink)); + openReleaseNoteLink.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + magiskManager.startActivity(openReleaseNoteLink); + } }) .setNegativeButton(R.string.no_thanks, null) .show(); diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java index b4ded8670..012cbe791 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java +++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java @@ -91,10 +91,12 @@ public class Utils { isDownloading = true; DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); - DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link)); - request.setDestinationUri(Uri.fromFile(file)); - receiver.setDownloadID(downloadManager.enqueue(request)); + if (link != null) { + DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link)); + request.setDestinationUri(Uri.fromFile(file)); + receiver.setDownloadID(downloadManager.enqueue(request)); + } receiver.setFilename(filename); context.registerReceiver(receiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)); }