Fixed Magisk Hide detection for Magisk v12

DeicPro · Jun 16, 2017 · d4e0218 · d4e0218
1 parent 3ac3b7d
commit d4e0218
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,8 @@
 Fix SafetyNet on devices with MIUI Developer/Beta ROM, CyanogenMod, Lineage OS, Resurrection Remix, etc.
 
 ## Changelog
+#### v1.11
+- Fixed Magisk Hide detection for Magisk v12
 #### v1.10
 - Module is now universal, not for Xiaomi devices only
 - Module refactored

diff --git a/common/post-fs-data.sh b/common/post-fs-data.sh
@@ -21,13 +21,24 @@ function background() {
         rm -f /dev/magisk_system/mirror/vendor
         ln -s /dev/magisk_system/mirror/system/vendor /dev/magisk_system/mirror/vendor
         while :; do
-            [ "$(grep 'Zygote.*ns=mnt:\[.*\]' '/cache/magisk.log')" ] && break || {
-                su -c /magisk/.core/magiskhide/disable; sleep 1
-                su -c /magisk/.core/magiskhide/enable; }
+            [ "$(grep 'Zygote.*ns=.*' '/cache/magisk.log')" ] && break || {
+                su -c exec /magisk/.core/magiskhide/disable; sleep 1
+                su -c exec /magisk/.core/magiskhide/enable; }
             sleep 3
         done; }
 
-    [ "$(magisk -v | grep '13.0(.*):MAGISK')" ] && {
+grep_logcat() {
+    set +x; while :; do logcat -b events -v raw -d | grep "$1" && { set -x; break; }; sleep 1; done
+}
+
+check_safetynet() {
+    echo "Waiting for Magisk Manager SafetyNet check..."
+    grep_logcat "MANAGER: SN: Google API Connected"
+    grep_logcat "MANAGER: SN: Check with nonce"
+    grep_logcat "MANAGER: SN: Response"
+}
+
+    [ "$(magisk -v | grep '13.0(.*):MAGISK' 2>/dev/null)" ] && {
         while :; do
             [ "$(grep 'proc_monitor:.*zygote.*ns=mnt:\[.*\]' '/cache/magisk.log')" ] && break || {
                 magiskhide --disable; sleep 1

diff --git a/config.sh b/config.sh
@@ -50,7 +50,7 @@ LATESTARTSERVICE=false
 
 print_modname() {
   ui_print "*******************************"
-  ui_print "        Universal SafetyNet Fix v1.10"
+  ui_print "Universal SafetyNet Fix v1.11"
   ui_print "*******************************"
 }
 

diff --git a/module.prop b/module.prop
@@ -1,7 +1,7 @@
 id=xiaomi-safetynet-fix
 name=Universal SafetyNet Fix
-version=v1.10
-versionCode=14
+version=v1.11
+versionCode=15
 author=Deiki
-description=Fix SafetyNet on devices with MIUI Developer/Beta ROM, CyanogenMod, Lineage OS, Resurrection Remix, etc.
+description=Try to fix SafetyNet on devices with MIUI Developer/Beta ROM, CyanogenMod, Lineage OS, Resurrection Remix, etc.
 template=3