MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crashing when installing modules

Browse Source
This commit is contained in:
topjohnwu 2017-07-15 01:22:00 +08:00
parent 4dc9419d2e
commit bcdface60d
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -8,8 +8,8 @@ android {
applicationId "com.topjohnwu.magisk" applicationId "com.topjohnwu.magisk"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 26 targetSdkVersion 26
versionCode 45 versionCode 46
versionName "5.0.5" versionName "5.0.6"
ndk { ndk {
moduleName 'zipadjust' moduleName 'zipadjust'
abiFilters 'x86', 'armeabi-v7a' abiFilters 'x86', 'armeabi-v7a'

3
app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java
View File

@ -3,6 +3,7 @@ package com.topjohnwu.magisk;
import android.animation.Animator; import android.animation.Animator;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@ -142,7 +143,7 @@ public class MagiskFragment extends Fragment
private boolean verity = keepVerityChkbox.isChecked(); private boolean verity = keepVerityChkbox.isChecked();
@Override @Override
public void onDownloadDone(Uri uri) { public void onDownloadDone(Uri uri, Context context) {
new ProcessMagiskZip(getActivity(), uri, boot, enc, verity).exec(); new ProcessMagiskZip(getActivity(), uri, boot, enc, verity).exec();
} }
}, },

10
app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
View File

@ -65,9 +65,8 @@ public class ReposAdapter extends RecyclerView.Adapter<ReposAdapter.ViewHolder>
mContext, mContext,
new DownloadReceiver() { new DownloadReceiver() {
@Override @Override
public void onDownloadDone(Uri uri) { public void onDownloadDone(Uri uri, Context context) {
Activity activity = (Activity) mContext; new ProcessRepoZip((Activity) mContext, uri, true).exec();
new ProcessRepoZip(activity, uri, true).exec();
} }
}, },
repo.getZipUrl(), repo.getZipUrl(),
@ -76,9 +75,8 @@ public class ReposAdapter extends RecyclerView.Adapter<ReposAdapter.ViewHolder>
mContext, mContext,
new DownloadReceiver() { new DownloadReceiver() {
@Override @Override
public void onDownloadDone(Uri uri) { public void onDownloadDone(Uri uri, Context context) {
Activity activity = (Activity) mContext; new ProcessRepoZip((Activity) mContext, uri, false).exec();
new ProcessRepoZip(activity, uri, false).exec();
} }
}, },
repo.getZipUrl(), repo.getZipUrl(),

6
app/src/main/java/com/topjohnwu/magisk/receivers/DownloadReceiver.java
View File

@ -12,7 +12,6 @@ import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
public abstract class DownloadReceiver extends BroadcastReceiver { public abstract class DownloadReceiver extends BroadcastReceiver {
public Context mContext;
public String mFilename; public String mFilename;
long downloadID; long downloadID;
@ -20,7 +19,6 @@ public abstract class DownloadReceiver extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
mContext = context;
DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
String action = intent.getAction(); String action = intent.getAction();
if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) { if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
@ -33,7 +31,7 @@ public abstract class DownloadReceiver extends BroadcastReceiver {
switch (status) { switch (status) {
case DownloadManager.STATUS_SUCCESSFUL: case DownloadManager.STATUS_SUCCESSFUL:
Uri uri = Uri.parse(c.getString(c.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI))); Uri uri = Uri.parse(c.getString(c.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)));
onDownloadDone(uri); onDownloadDone(uri, context);
break; break;
default: default:
Toast.makeText(context, R.string.download_file_error, Toast.LENGTH_LONG).show(); Toast.makeText(context, R.string.download_file_error, Toast.LENGTH_LONG).show();
@ -54,5 +52,5 @@ public abstract class DownloadReceiver extends BroadcastReceiver {
mFilename = filename; mFilename = filename;
} }
public abstract void onDownloadDone(Uri uri); public abstract void onDownloadDone(Uri uri, Context context);
} }

8
app/src/main/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java
View File

@ -18,19 +18,19 @@ public class ManagerUpdate extends BroadcastReceiver {
context, context,
new DownloadReceiver() { new DownloadReceiver() {
@Override @Override
public void onDownloadDone(Uri uri) { public void onDownloadDone(Uri uri, Context context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
Intent install = new Intent(Intent.ACTION_INSTALL_PACKAGE); Intent install = new Intent(Intent.ACTION_INSTALL_PACKAGE);
install.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); install.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
Uri content = FileProvider.getUriForFile(mContext, Uri content = FileProvider.getUriForFile(context,
"com.topjohnwu.magisk.provider", new File(uri.getPath())); "com.topjohnwu.magisk.provider", new File(uri.getPath()));
install.setData(content); install.setData(content);
mContext.startActivity(install); context.startActivity(install);
} else { } else {
Intent install = new Intent(Intent.ACTION_VIEW); Intent install = new Intent(Intent.ACTION_VIEW);
install.setDataAndType(uri, "application/vnd.android.package-archive"); install.setDataAndType(uri, "application/vnd.android.package-archive");
install.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); install.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(install); context.startActivity(install);
} }
} }
}, },