TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-11-15 08:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Functionality done

Browse Source
This commit is contained in:
topjohnwu
2016-12-27 04:38:16 +08:00
parent 13ec1aafa0
commit 5e7c3ed46a
7 changed files with 111 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,6 @@ public class Async {
StatusFragment.remoteMagiskVersion = magisk.getDouble("versionCode");
StatusFragment.magiskLink = magisk.getString("link");
StatusFragment.magiskChangelog = magisk.getString("changelog");
} catch (JSONException ignored) {}
return null;
}
@@ -153,7 +152,8 @@ public class Async {
protected void preProcessing() throws Throwable {}
private void copyToCache() throws Throwable {
protected void copyToCache() throws Throwable {
publishProgress(mContext.getString(R.string.copying_msg));
try {
InputStream in = mContext.getContentResolver().openInputStream(mUri);
mCachedFile = new File(mContext.getCacheDir().getAbsolutePath() + "/install.zip");
@@ -229,7 +229,7 @@ public class Async {
}
return -1;
}
if (ret != null && Boolean.parseBoolean(ret.get(ret.size() - 1))) {
if (Boolean.parseBoolean(ret.get(ret.size() - 1))) {
return 1;
}
return -1;
@@ -299,9 +299,11 @@ public class Async {
public static class GetBootBlocks extends RootTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... params) {
InstallFragment.blockList = Shell.su("ls /dev/block | grep mmc");
if (InstallFragment.bootBlock == null) {
InstallFragment.bootBlock = Utils.detectBootImage();
if (Shell.rootAccess()) {
InstallFragment.blockList = Shell.su("ls /dev/block | grep mmc");
if (InstallFragment.bootBlock == null) {
InstallFragment.bootBlock = Utils.detectBootImage();
}
}
return null;
}