Warn of possible conflict if MagiskHidePropsConfig is installed

This commit is contained in:
osm0sis 2023-11-29 12:55:27 -04:00
parent 69aba6a7f1
commit 3b76379a3b
No known key found for this signature in database
GPG Key ID: 6F67B35EACE37744
2 changed files with 10 additions and 5 deletions

View File

@ -3,11 +3,14 @@ if [ "$API" -lt 26 ]; then
abort "!!! You can't use this module on Android < 8.0" abort "!!! You can't use this module on Android < 8.0"
fi fi
# Remove safetynet-fix module if installed # Remove/warn if conflicting modules are installed
if [ -d /data/adb/modules/safetynet-fix ]; then if [ -d /data/adb/modules/safetynet-fix ]; then
touch /data/adb/modules/safetynet-fix/remove touch /data/adb/modules/safetynet-fix/remove
ui_print "- 'safetynet-fix' module will be removed on next reboot" ui_print "- 'safetynet-fix' module will be removed on next reboot"
fi fi
if [ -d /data/adb/modules/MagiskHidePropsConf ]; then
ui_print "- Warning, 'MagiskHidePropsConf' module may cause issues with PIF"
fi
# Clean up any leftover files from previous deprecated methods # Clean up any leftover files from previous deprecated methods
rm -f /data/data/com.google.android.gms/cache/pif.prop /data/data/com.google.android.gms/pif.prop rm -f /data/data/com.google.android.gms/cache/pif.prop /data/data/com.google.android.gms/pif.prop

View File

@ -3,10 +3,12 @@ if magisk --denylist status; then
magisk --denylist rm com.google.android.gms magisk --denylist rm com.google.android.gms
fi fi
# Remove safetynet-fix module if installed # Remove conflicting modules if installed
if [ -d /data/adb/modules/safetynet-fix ]; then for i in MagiskHidePropsConf safetynet-fix; do
touch /data/adb/modules/safetynet-fix/remove if [ -d /data/adb/modules/$i ]; then
fi touch /data/adb/modules/$i/remove
fi
done
# Conditional early sensitive properties # Conditional early sensitive properties