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

FlashZIP: preProcess need no root; fix toast message

Browse Source
This commit is contained in:
topjohnwu 2016-10-03 01:12:24 +08:00
parent 887ce3377e
commit c4e90b810d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View File

@ -199,6 +199,7 @@ public class Async {
try { try {
InputStream in = mContext.getContentResolver().openInputStream(mUri); InputStream in = mContext.getContentResolver().openInputStream(mUri);
mFile = new File(mContext.getCacheDir().getAbsolutePath() + "/install.zip"); mFile = new File(mContext.getCacheDir().getAbsolutePath() + "/install.zip");
mFile.delete();
Utils.removeFile(mFile.getPath()); Utils.removeFile(mFile.getPath());
createFileFromInputStream(in, mFile); createFileFromInputStream(in, mFile);
in.close(); in.close();
@ -220,15 +221,15 @@ public class Async {
protected Integer doInBackground(Void... voids) { protected Integer doInBackground(Void... voids) {
Logger.dev("FlashZip Running... " + mName); Logger.dev("FlashZip Running... " + mName);
List<String> ret = null; List<String> ret = null;
try {
preProcessing();
} catch (Throwable e) {
this.cancel(true);
progress.cancel();
e.printStackTrace();
return -1;
}
if (Shell.rootAccess()) { if (Shell.rootAccess()) {
try {
preProcessing();
} catch (Throwable e) {
this.cancel(true);
progress.cancel();
e.printStackTrace();
return -1;
}
ret = Shell.su( ret = Shell.su(
"unzip -o " + mFile.getPath() + " META-INF/com/google/android/* -d " + mFile.getParent(), "unzip -o " + mFile.getPath() + " META-INF/com/google/android/* -d " + mFile.getParent(),
"if [ \"$(cat " + mFile.getParent() + "/META-INF/com/google/android/updater-script)\" = \"#MAGISK\" ]; then echo true; else echo false; fi" "if [ \"$(cat " + mFile.getParent() + "/META-INF/com/google/android/updater-script)\" = \"#MAGISK\" ]; then echo true; else echo false; fi"
@ -290,7 +291,7 @@ public class Async {
if (sdFile == null) { if (sdFile == null) {
Toast.makeText(mContext, mContext.getString(R.string.install_error), Toast.LENGTH_LONG).show(); Toast.makeText(mContext, mContext.getString(R.string.install_error), Toast.LENGTH_LONG).show();
} else { } else {
Toast.makeText(mContext, mContext.getString(R.string.manual_install, mFile.getAbsolutePath()), Toast.LENGTH_LONG).show(); Toast.makeText(mContext, mContext.getString(R.string.manual_install, sdFile.getAbsolutePath()), Toast.LENGTH_LONG).show();
} }
break; break;
case 0: case 0: