Change paths and added Magisk check to 2 methods

Sean-Tang · Mar 16, 2018 · bfba456 · bfba456
1 parent 1853c45
commit bfba456
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/app/src/main/java/com/scottyab/rootbeer/sample/CheckRootTask.java b/app/src/main/java/com/scottyab/rootbeer/sample/CheckRootTask.java
@@ -121,6 +121,10 @@ protected Boolean doInBackground(Boolean... params) {
                     mIsCheck = Utils.isSelinuxFlagInEnabled();
                     Log.d(TAG, "Selinux Flag Is Enabled " + (mIsCheck ? "true" : "false"));
                     break;
+                case 89:
+                    mIsCheck = check.checkForMagiskBinary();
+                    Log.d(TAG, "Magisk " + (mIsCheck ? "deteced" : "not deteced"));
+                    break;
             }
             publishProgress(i);
         }

diff --git a/rootbeerlib/src/main/java/com/scottyab/rootbeer/Const.java b/rootbeerlib/src/main/java/com/scottyab/rootbeer/Const.java
@@ -54,8 +54,9 @@ private Const() throws InstantiationException {
             "/system/sd/xbin/",
             "/system/usr/we-need-root/",
             "/system/xbin/",
-            "/cache/magisk",
-            "/data/busybox"
+            "/cache",
+            "/data",
+            "/dev"
     };
 
 

diff --git a/rootbeerlib/src/main/java/com/scottyab/rootbeer/RootBeer.java b/rootbeerlib/src/main/java/com/scottyab/rootbeer/RootBeer.java
@@ -42,7 +42,7 @@ public boolean isRooted() {
 
         return detectRootManagementApps() || detectPotentiallyDangerousApps() || checkForBinary("su")
                 || checkForBinary("busybox") || checkForDangerousProps() || checkForRWPaths()
-                || detectTestKeys() || checkSuExists() || checkForRootNative();
+                || detectTestKeys() || checkSuExists() || checkForRootNative() || checkForMagiskBinary();
     }
 
     /**
@@ -54,7 +54,7 @@ public boolean isRootedWithoutBusyBoxCheck() {
 
         return detectRootManagementApps() || detectPotentiallyDangerousApps() || checkForBinary("su")
                 || checkForDangerousProps() || checkForRWPaths()
-                || detectTestKeys() || checkSuExists() || checkForRootNative();
+                || detectTestKeys() || checkSuExists() || checkForRootNative() || checkForMagiskBinary();
     }
 
     /**
@@ -143,7 +143,6 @@ public boolean detectRootCloakingApps(String[] additionalRootCloakingApps) {
         return isAnyPackageFromListInstalled(packages);
     }
 
-
     /**
      * Checks various (Const.suPaths) common locations for the SU binary
      * @return true if found
@@ -152,6 +151,12 @@ public boolean checkForSuBinary(){
         return checkForBinary("su");
     }
 
+    /**
+     * Checks various (Const.suPaths) common locations for the Magisk binary
+     * @return true if found
+     */
+    public boolean checkForMagiskBinary(){ return checkForBinary("magisk"); }
+
     /**
      * Checks various (Const.suPaths) common locations for the busybox binary (a well know root level program)
      * @return true if found