TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-11-16 09:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix and tweaks for MagiskHide

Browse Source
This commit is contained in:
topjohnwu
2016-11-07 23:59:10 +08:00
parent b69a4fe8b5
commit 793269731d
7 changed files with 137 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,11 +48,11 @@ public class Async {
public static final String UPDATE_JSON = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/updates/magisk_update.json";
public static final String MAGISK_HIDE_PATH = "/magisk/.core/magiskhide/";
public static class constructEnv extends NormalTask<Void, Void, Void> {
public static class ConstructEnv extends NormalTask<Void, Void, Void> {
ApplicationInfo mInfo;
public constructEnv(ApplicationInfo info) {
public ConstructEnv(ApplicationInfo info) {
mInfo = info;
}
@@ -350,7 +350,7 @@ public class Async {
}
}
public static class LinkBusyBox extends AsyncTask<Void, Void, Void> {
public static class LinkBusyBox extends RootTask<Void, Void, Void> {
private boolean link;

38
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View File

@@ -4,11 +4,9 @@ import android.Manifest;
import android.app.DownloadManager;
import android.content.Context;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.support.v4.app.ActivityCompat;
import android.util.Base64;
import android.widget.Toast;
@@ -33,8 +31,6 @@ import javax.crypto.spec.DESKeySpec;
public class Utils {
private static final String TAG = "Magisk";
private static final String cryptoPass = "MagiskRox666";
private static final String secret = "GTYybRBTYf5his9kQ16ZNO7qgkBJ/5MyVe4CGceAOIoXgSnnk8FTd4F1dE9p5Eus";
@@ -51,29 +47,6 @@ public class Utils {
}
}
public static String getAppUID(String packageName) {
List<String> retString = Shell.su("ls -nld /data/data/" + packageName);
String splitMe = retString.get(0);
String[] splitString = retString.get(0).split(" ");
return splitString[5];
}
public static int WhichHide(Context context) {
Boolean mh = PreferenceManager.getDefaultSharedPreferences(context).getBoolean("magiskhide", false);
Boolean sh = Utils.itemExist("/su/suhide/add");
if (mh && !sh) {
return 1;
}
if (sh && !mh) {
return 2;
}
if (sh && mh) {
return 3;
}
return 0;
}
public static boolean commandExists(String s) {
List<String> ret;
String command = "if [ -z $(which " + s + ") ]; then echo false; else echo true; fi";
@@ -81,17 +54,6 @@ public class Utils {
return Boolean.parseBoolean(ret.get(0));
}
public static boolean rootEnabled() {
return commandExists("su");
}
public static boolean autoToggleEnabled(Context context) {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
Logger.dev("Utils: AutoRootEnableCheck is " + preferences.getBoolean("autoRootEnable", false));
return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("autoRootEnable", false);
}
public static boolean createFile(String path) {
String command = "touch " + path + " 2>/dev/null; if [ -f " + path + " ]; then echo true; else echo false; fi";
return Shell.rootAccess() && Boolean.parseBoolean(Shell.su(command).get(0));