From ab6cf62ebc9af41def1bbd9b611505c4829de81a Mon Sep 17 00:00:00 2001 From: Didgeridoohan Date: Mon, 26 Mar 2018 18:25:58 +0200 Subject: [PATCH] v1.2.0-v3 --- README.md | 43 +++++++++++++++++++++--------- common/post-fs-data.sh | 2 +- common/prints.sh | 19 +++++++------- common/util_functions.sh | 55 +++++++++++++++++++++++++++++++++------ module.prop | 4 +-- system/binpath/props | Bin 27739 -> 27406 bytes 6 files changed, 91 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 5eaf9cd..4476b32 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,13 @@ ## Installation -Download the zip from the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-simple-t3765199), and install through the Magisk Manager -> Modules, or from recovery. -Any previous versions are kept in the first post of the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-simple-t3765199). +Install through the Magisk Manager Downloads section. Or, download the zip from the Manager or the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-simple-t3765199), and install through the Magisk Manager -> Modules, or from recovery. + +The current release is always attached to the OP of the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-simple-t3765199). Any previous releases can also be found on [GitHub](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/releases). If downloading a release from GitHub, make sure to repackage the zip with all the module files and folders in the root of the zip. Otherwise it won't install (error: "not a Magisk zip"). ## Usage -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)). +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 @@ -21,9 +22,7 @@ If your device can't pass SafetyNet fully, the CTS profile check fails while bas This might be because your device simply hasn't been certified or that the ROM you are using on your device isn't recognised by Google (because it's a custom ROM). -To fix this, you can use a known working fingerprint (one that has been certified by Google), usually from a stock ROM/firmware/factory image, and replace your device's current fingerprint with this. - -Keep in mind that changing the fingerprint of your device might have some side-effects, since you are changing how your device is percieved. Most of the times it works fine though. IMO it is preferable to use a fingerprint from a stock ROM for your specific device. +To fix this, you can use a known working fingerprint (one that has been certified by Google), usually from a stock ROM/firmware/factory image, and replace your device's current fingerprint with this. You can also use a fingerprint from another device, but this will change how your device is perceived. There are a few pre-configured certified fingerprints available in the module, just in case you can't get a hold of one for your device. If you have a working fingerprint that could be added to the list, or an updated one for one already on there, please post that in the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-simple-t3765199) toghether with device details. @@ -35,7 +34,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 `printslist`, in the root of your internal storage with the fingerprint. It needs to be formated as follows:`=`. +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`. Here's an example: ``` Google Nexus 6=google/shamu/shamu:7.1.1/N8I11B/4171878:user/release-keys @@ -45,9 +44,9 @@ Google Nexus 6=google/shamu/shamu:7.1.1/N8I11B/4171878:user/release-keys ## Current fingerprints list version The fingerprints list will update without the need to update the entire module. Keep an eye on the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-simple-t3765199) for info. -Just run the `props` command and it'll be updated automatically. +Just run the `props` command and the list will be updated automatically. -**_Current fingerprints list version - v2_** +**_Current fingerprints list version - v3_** ## Editing build.prop and default.prop @@ -72,14 +71,14 @@ If you're having issues passing SafetyNet or otherwise getting MagiskHide to wor ## Support, etc -If you're having issues, questions or suggestions, visit the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-simple-t3765199) @XDA. +If you have questions, suggestions or are experiensing some kind of issue, visit the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-simple-t3765199) @XDA. ### Logs, etc -Please provide the logs saved in /cache, "propsconf.log" and "propsconf_last.log", together with a detailed description of your issue. Providing the output from terminal might also be useful. +In case of issues, please provide the logs, saved in /cache, "propsconf.log" and "propsconf_last.log", together with a detailed description of your problem. Providing the output from terminal might also be useful. ## Source -[GitHub](https://github.com/Didgeridoohan/MagiskHide-Props-Config) +[GitHub](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config) ## Credits @@ -88,9 +87,29 @@ Please provide the logs saved in /cache, "propsconf.log" and "propsconf_last.log ## Changelog +### v1.2.0 +- Now in the Magisk repo. Updated to match. +- New fingerprint, list v3. +- Check connection when checking for fingerprint updates. +- Show info when checking for fingerprint updates. +- Minor changes and improvements. + ### v1.1.0 - New fingerprint added (Sony Xperia Z3). - Added the ability to update the fingerprints list automatically ### v1.0.0 - Initial release. Compatible with Magisk v15+. + + +## Current fingerprints list +### List v3 +- Google Nexus 6 (7.1.1) +- Google Pixel 2 (P DP1) +- Google Pixel 2 XL (8.1.0) +- OnePlus 3T (8.0.0) +- OnePlus 5T (7.1.1) +- Samsung Galaxy Grand Prime (5.0.2) +- Samsung Galaxy S8 Plus (7.0) +- Sony Xperia Z3 (6.0.1) +- Xiaomi Mi6 (7.1.1) \ No newline at end of file diff --git a/common/post-fs-data.sh b/common/post-fs-data.sh index a8d9ae6..1e0343b 100644 --- a/common/post-fs-data.sh +++ b/common/post-fs-data.sh @@ -18,7 +18,7 @@ USNFLIST=USNF_PLACEHOLDER # Load functions . $MODDIR/util_functions.sh -MODVERSION=$(get_file_value $MODDIR/module.prop "version=") +MODVERSION=$(echo $(get_file_value $MODDIR/module.prop "version=") | sed 's/-.*//') # Saves the previous log (if available) and creates a new one if [ -f "$LOGFILE" ]; then diff --git a/common/prints.sh b/common/prints.sh index 3ffe9f6..4363d2e 100644 --- a/common/prints.sh +++ b/common/prints.sh @@ -3,21 +3,22 @@ # MagiskHide Props Config # By Didgeridoohan @ XDA-Developers -PRINTSV=2 +PRINTSV=3 PRINTSTRANSF=1 PRINTSFILE=/sdcard/printslist # Certified fingerprints PRINTSLIST=" -Google Nexus 6=google/shamu/shamu:7.1.1/N8I11B/4171878:user/release-keys -Google Pixel 2 XL=google/taimen/taimen:8.1.0/OPM1.171019.013/4474084:user/release-keys -OnePlus 3T=OnePlus/OnePlus3/OnePlus3T:8.0.0/OPR6.170623.013/12041042:user/release-keys -OnePlus 5T=OnePlus/OnePlus5T/OnePlus5T:7.1.1/NMF26X/12152312:user/release-keys -Samsung Galaxy Grand Prime=samsung/fortuna3gdtvvj/fortuna3gdtv:5.0.2/LRX22G/G530BTVJU1BPH4:user/release-keys -Samsung S8 Plus=samsung/dream2ltexx/dream2lte:7.0/NRD90M/G955FXXU1AQGB:user/release-keys -Sony Xperia Z3=Sony/D6633/D6633:6.0.1/23.5.A.1.291/2769308465:user/release-keys -Xiaomi Mi6=Xiaomi/sagit/sagit:7.1.1/NMF26X/V8.2.17.0.NCACNEC:user/release-keys +Google Nexus 6 (7.1.1)=google/shamu/shamu:7.1.1/N8I11B/4171878:user/release-keys +Google Pixel 2 (P DP1)=google/walleye/walleye:P/PPP1.180208.014/4633861:user/release-keys +Google Pixel 2 XL (8.1.0)=google/taimen/taimen:8.1.0/OPM1.171019.013/4474084:user/release-keys +OnePlus 3T (8.0.0)=OnePlus/OnePlus3/OnePlus3T:8.0.0/OPR6.170623.013/12041042:user/release-keys +OnePlus 5T (7.1.1)=OnePlus/OnePlus5T/OnePlus5T:7.1.1/NMF26X/12152312:user/release-keys +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 " if [ -f "$PRINTSFILE" ]; then diff --git a/common/util_functions.sh b/common/util_functions.sh index 1c382c8..5bd0e99 100644 --- a/common/util_functions.sh +++ b/common/util_functions.sh @@ -10,10 +10,9 @@ MAGISKLOC=/data/adb/magisk BBPATH=$MAGISKLOC/busybox PRINTSLOC=$MODPATH/prints.sh PRINTSTMP=/cache/prints.sh -PRINTSWWW="https://raw.githubusercontent.com/Didgeridoohan/MagiskHide-Props-Config/master/common/prints.sh" +PRINTSWWW="https://raw.githubusercontent.com/Magisk-Modules-Repo/MagiskHide-Props-Config/master/common/prints.sh" alias cat="$BBPATH cat" alias grep="$BBPATH grep" -alias reboot="/system/bin/reboot" alias resetprop="$MAGISKLOC/magisk resetprop" alias sed="$BBPATH sed" alias tr="$BBPATH tr" @@ -42,6 +41,30 @@ log_handler() { echo "" >> $LOGFILE echo -e "$(date +"%m-%d-%Y %H:%M:%S") - $1" >> $LOGFILE } +log_print() { + echo "$1" + log_handler "$1" +} + + +#Divider +DIVIDER="${Y}=====================================${N}" + +# Header +menu_header() { + if [ "$MODVERSION" == "VER_PLACEHOLDER" ]; then + VERSIONTXT="" + else + VERSIONTXT=$MODVERSION + fi + echo "" + echo "${W}MagiskHide Props Config $VERSIONTXT${N}" + echo "${W}by Didgeridoohan @ XDA Developers${N}" + echo "" + echo $DIVIDER + echo -e " $1" + echo $DIVIDER +} # Finding file values get_file_value() { @@ -90,13 +113,29 @@ placeholder_update() { } download_prints() { - wget -O $PRINTSTMP $PRINTSWWW 2>> $LOGFILE - if [ "$(get_file_value $PRINTSTMP "PRINTSV=")" -gt "$(get_file_value $PRINTSLOC "PRINTSV=")" ]; then - if [ "$(get_file_value $PRINTSTMP "PRINTSTRANSF=")" -ge "$(get_file_value $PRINTSLOC "PRINTSTRANSF=")" ]; then - mv -f $PRINTSTMP $PRINTSLOC - log_handler "Updated prints.sh to v$(get_file_value $PRINTSLOC "PRINTSV=")." + clear + menu_header "Updating fingerprints list" + echo "" + log_print "Checking list version." + wget -T 10 -O $PRINTSTMP $PRINTSWWW 2>> $LOGFILE + if [ -f "$PRINTSTMP" ]; then + LISTVERSION=$(get_file_value $PRINTSTMP "PRINTSV=") + if [ "$LISTVERSION" -gt "$(get_file_value $PRINTSLOC "PRINTSV=")" ]; then + if [ "$(get_file_value $PRINTSTMP "PRINTSTRANSF=")" -le "$(get_file_value $PRINTSLOC "PRINTSTRANSF=")" ]; then + mv -f $PRINTSTMP $PRINTSLOC + # Updates list version in module.prop + VERSIONTMP=$(get_file_value $MODPATH/module.prop "version=") + sed -i "s/version=$VERSIONTMP/version=$MODVERSION-v$LISTVERSION/g" $MODPATH/module.prop + log_print "Updated list to v$LISTVERSION." + else + rm -f $PRINTSTMP + log_print "New fingerprints list requires module update." + fi + else + rm -f $PRINTSTMP + log_print "Fingerprints list up-to-date." fi else - rm -f $PRINTSTMP + log_print "No connection." fi } \ No newline at end of file diff --git a/module.prop b/module.prop index 2c2fc47..10d796c 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=MagiskHidePropsConf name=MagiskHide Props Config -version=v1.1.0 -versionCode=2 +version=v1.2.0-v3 +versionCode=3 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 97175951fecd4b7c568433f2efa1ee08253bd9de..a5900bfac97e929e2224ec418d573773abe5a472 100644 GIT binary patch delta 78 zcmcb8gR$=#-u z3UX8PO5-!YYz<9?YA(*qG=*pdB^6(PmoV3$U{8NPB?Vhs1tlOSKETJ(+110}2WX&@ zLaenyNk(cO7bhoFT}VWTt&$QKXKGGyDyk@wVSZekX_-JZ$r