diff --git a/README.md b/README.md index 48b1bc1..aa7f3d0 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The current release is always attached to the OP of the [module support thread]( ## Usage -After installing the module and rebooting, run the command `props` (as su) in a terminal emulator (you can find one on [F-Droid](https://f-droid.org/) or in the [Play Store](https://play.google.com/store/apps)), and follow the instructions to set your desired options. +After installing the module and rebooting, run the command `props` (as su) in a terminal emulator (you can find a one on [F-Droid](https://f-droid.org/) or in the [Play Store](https://play.google.com/store/apps)), and follow the instructions to set your desired options. ``` su props @@ -37,7 +37,7 @@ getprop ro.build.fingerprint If you're already on a custom ROM that can't pass the CTS profile check, this might not be an option... Head over to your device's forum and ask for help. If someone can run the getprop command on their device for you, you're good to go. ### Custom fingerprints list -You can add your own fingerprint to the list by placing a file, named `printslis`, in the root of your internal storage with the fingerprint. It needs to be formated as follows:`device name=fingerprint`. +You can add your own fingerprint to the list by placing a file, named `printslist`, in the root of your internal storage with the fingerprint. It needs to be formated as follows:`device name=fingerprint`. Here's an example: ``` Google Nexus 6=google/shamu/shamu:7.1.1/N8I11B/4171878:user/release-keys @@ -49,7 +49,7 @@ The fingerprints list will update without the need to update the entire module. Just run the `props` command and the list will be updated automatically. -**_Current fingerprints list version - v3_** +**_Current fingerprints list version - v4_** ## Editing build.prop and default.prop @@ -90,9 +90,14 @@ In case of issues, please provide the logs, saved in /cache, "propsconf.log" and ## Changelog +### v1.2.1 +- Fixed logic for checking the original prop values. +- New fingerprints (Xiaomi Mi 5, ZTE Axon 7), list v4. +- Minor fixes. + ### v1.2.0 - Now in the Magisk repo. Updated to match. -- New fingerprint, list v3. +- New fingerprint (Pixel 2), list v3. - Show info when checking for fingerprint updates. - Minor changes and improvements. @@ -105,7 +110,7 @@ In case of issues, please provide the logs, saved in /cache, "propsconf.log" and ## Current fingerprints list -### List v3 +### List v4 - Google Nexus 6 (7.1.1) - Google Pixel 2 (P DP1) - Google Pixel 2 XL (8.1.0) @@ -114,4 +119,6 @@ In case of issues, please provide the logs, saved in /cache, "propsconf.log" and - Samsung Galaxy Grand Prime (5.0.2) - Samsung Galaxy S8 Plus (7.0) - Sony Xperia Z3 (6.0.1) +- Xiaomi Mi 5 (7.0) - Xiaomi Mi6 (7.1.1) +- ZTE Axon 7 (7.1.1) \ No newline at end of file diff --git a/common/post-fs-data.sh b/common/post-fs-data.sh index 1e0343b..bcdc3d5 100644 --- a/common/post-fs-data.sh +++ b/common/post-fs-data.sh @@ -85,6 +85,9 @@ ORIGTYPE=$(resetprop ro.build.type) ORIGTAGS=$(resetprop ro.build.tags) ORIGSELINUX=$(resetprop ro.build.selinux) ORIGFINGERPRINT=$(resetprop ro.build.fingerprint) +if [ ! "$ORIGFINGERPRINT" ]; then + ORIGFINGERPRINT=$(resetprop ro.bootimage.build.fingerprint) +fi # Save defatul prop values in propsconf_late sed -i "s/ORIGDEBUGGABLE=$LATEDEBUGGABLE/ORIGDEBUGGABLE=$ORIGDEBUGGABLE/" $LATEFILE diff --git a/common/prints.sh b/common/prints.sh index 4363d2e..241b660 100644 --- a/common/prints.sh +++ b/common/prints.sh @@ -3,7 +3,7 @@ # MagiskHide Props Config # By Didgeridoohan @ XDA-Developers -PRINTSV=3 +PRINTSV=4 PRINTSTRANSF=1 PRINTSFILE=/sdcard/printslist @@ -18,7 +18,9 @@ OnePlus 5T (7.1.1)=OnePlus/OnePlus5T/OnePlus5T:7.1.1/NMF26X/12152312:user/releas Samsung Galaxy Grand Prime (5.0.2)=samsung/fortuna3gdtvvj/fortuna3gdtv:5.0.2/LRX22G/G530BTVJU1BPH4:user/release-keys Samsung Galaxy S8 Plus (7.0)=samsung/dream2ltexx/dream2lte:7.0/NRD90M/G955FXXU1AQGB:user/release-keys Sony Xperia Z3 (6.0.1)=Sony/D6633/D6633:6.0.1/23.5.A.1.291/2769308465:user/release-keys -Xiaomi Mi6 (7.1.1)=Xiaomi/sagit/sagit:7.1.1/NMF26X/V8.2.17.0.NCACNEC:user/release-keys +Xiaomi Mi 5 (7.0)=Xiaomi/gemini/gemini:7.0/NRD90M/V9.2.1.0.NAAMIEK:user/release-keys +Xiaomi Mi 6 (7.1.1)=Xiaomi/sagit/sagit:7.1.1/NMF26X/V8.2.17.0.NCACNEC:user/release-keys +ZTE Axon 7 (7.1.1)=ZTE/P996A01_N/ailsa_ii:7.1.1/NMF26V/20171211.005949:user/release-keys " if [ -f "$PRINTSFILE" ]; then diff --git a/common/util_functions.sh b/common/util_functions.sh index 5bd0e99..426692e 100644 --- a/common/util_functions.sh +++ b/common/util_functions.sh @@ -138,4 +138,19 @@ download_prints() { else log_print "No connection." fi -} \ No newline at end of file +} + +orig_check() { + PROPSTMPLIST=$PROPSLIST" + ro.build.fingerprint + " + ORIGLOAD=0 + for PROPTYPE in $PROPSTMPLIST; do + PROP=$(get_prop_type $PROPTYPE) + ORIGPROP=$(echo "ORIG$PROP" | tr '[:lower:]' '[:upper:]') + ORIGVALUE=$(get_file_value $LATEFILE "$ORIGPROP=") + if [ "$ORIGVALUE" ]; then + ORIGLOAD=1 + fi + done +} diff --git a/module.prop b/module.prop index 10d796c..8b2f7c9 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=MagiskHidePropsConf name=MagiskHide Props Config -version=v1.2.0-v3 -versionCode=3 +version=v1.2.1-v4 +versionCode=4 author=Didgeridoohan description=Change your device's fingerprint, to pass SafetyNet's CTS Profile check. Edit prop files for better root hiding. Set/reset prop values set by MagiskHide. minMagisk=1500 diff --git a/system/binpath/props b/system/binpath/props index a5900bf..19c48d3 100644 Binary files a/system/binpath/props and b/system/binpath/props differ