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

Bump to 4.3.1

Browse Source
This commit is contained in:
topjohnwu 2017-03-31 13:17:58 +08:00
parent 234bead59e
commit 0a0ad9a184
2 changed files with 10 additions and 3 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 25 targetSdkVersion 25
versionCode 27 versionCode 28
versionName "4.3.0" versionName "4.3.1"
jackOptions { jackOptions {
enabled true enabled true
jackInProcess true jackInProcess true

9
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
View File

@ -64,6 +64,7 @@ public class MagiskManager extends Application {
public boolean magiskHide; public boolean magiskHide;
public boolean isDarkTheme; public boolean isDarkTheme;
public boolean updateNotification; public boolean updateNotification;
public boolean busybox;
public int suRequestTimeout; public int suRequestTimeout;
public int suLogTimeout = 14; public int suLogTimeout = 14;
public int suAccessState; public int suAccessState;
@ -104,7 +105,7 @@ public class MagiskManager extends Application {
.putBoolean("dark_theme", isDarkTheme) .putBoolean("dark_theme", isDarkTheme)
.putBoolean("magiskhide", magiskHide) .putBoolean("magiskhide", magiskHide)
.putBoolean("notification", updateNotification) .putBoolean("notification", updateNotification)
.putBoolean("busybox", Utils.commandExists("busybox")) .putBoolean("busybox", busybox)
.putBoolean("hosts", new File("/magisk/.core/hosts").exists()) .putBoolean("hosts", new File("/magisk/.core/hosts").exists())
.putBoolean("disable", Utils.itemExist(MAGISK_DISABLE_FILE)) .putBoolean("disable", Utils.itemExist(MAGISK_DISABLE_FILE))
.putString("su_request_timeout", String.valueOf(suRequestTimeout)) .putString("su_request_timeout", String.valueOf(suRequestTimeout))
@ -150,6 +151,12 @@ public class MagiskManager extends Application {
magiskVersion = Double.POSITIVE_INFINITY; magiskVersion = Double.POSITIVE_INFINITY;
} }
} }
ret = Shell.sh("getprop persist.magisk.busybox");
try {
busybox = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
} catch (NumberFormatException e) {
busybox = false;
}
ret = Shell.sh("getprop ro.magisk.disable"); ret = Shell.sh("getprop ro.magisk.disable");
try { try {
disabled = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0; disabled = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;