From 888d0c013824a480bbbd4f5450d595ace59c1767 Mon Sep 17 00:00:00 2001 From: Didgeridoohan Date: Fri, 17 Jan 2020 09:44:46 +0100 Subject: [PATCH] v5.1.2-v73 --- README.md | 46 ++++++++++++++++++++-------------------- common/prints.sh | 12 +++++++---- common/util_functions.sh | 34 +++++++++++++++++------------ customize.sh | 16 +++++++++----- module.prop | 4 ++-- service.sh | 12 ++++++++--- 6 files changed, 74 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 7857d06..940fbd6 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ Keep reading below to find out more details about the different parts of the mod - [I can't pass the ctsProfile check](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#i-cant-pass-the-ctsprofile-check) - [I can't pass the basicIntegrity check](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#i-cant-pass-the-basicintegrity-check) - [Props don't seem to set properly](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#props-dont-seem-to-set-properly) + - [My build.prop doesn't change after setting a custom prop or removing a prop value](https://github.com/Magisk-Modules-Repo/MagiskHidePropsConf/blob/master/README.md#my-buildprop-doesnt-change-after-setting-a-custom-prop-or-removing-a-prop-value) - [My device's Android security patch date changed](https://github.com/Magisk-Modules-Repo/MagiskHidePropsConf/blob/master/README.md#my-devices-android-security-patch-date-changed) - [The interface looks weird](https://github.com/Magisk-Modules-Repo/MagiskHidePropsConf/blob/master/README.md#the-interface-looks-weird) - [Device issues because of the module](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#device-issues-because-of-the-module) @@ -214,7 +215,7 @@ Just run the `props` command and the list will be updated automatically. Use the If you already have a device fingerprint set by the module, and it has been updated in the current fingerprints list, it will be automatically updated when the prints list gets an update. Just reboot to apply. This function can be turned of in the script settings (see ["Prop script settings"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#prop-script-settings) below) -**_Current fingerprints list version - 72_** +**_Current fingerprints list version - v73_** ## Please add support for device X @@ -271,26 +272,9 @@ When setting a custom prop you can also pick in what boot stage it should be set Note: post-fs-data runs earlier than late_start service. -### My build.prop doesn't change after setting a custom prop -Magisk doesn't alter the build.prop file when changing a custom prop value, it simply loads the new value instead of the one in build.prop. If you want to check if the new value has been loaded you can see this by selecting the prop in the "Add/edit custom props" menu of the `props` script. - -You can also use the `getprop` command in a terminal emulator to check the set value. Example: -``` -getprop ro.build.fingerprint -``` - - ## Removing prop values If you would like to delete a certain prop value from your system, that can be done with the [Magisk resetprop tool](https://github.com/topjohnwu/Magisk/blob/master/docs/tools.md#resetprop). With this module you can easily set that up by adding whatever prop you want removed to the "Delete props" list. Be very careful when using this option, since removing the wrong prop may cause isses with your device. See ["Device issues because of the module"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#device-issues-because-of-the-module) below if this happens. -### My build.prop doesn't change after removing a prop value -Magisk doesn't alter the build.prop file when removing a prop value, it simply prevents the prop to load instead of removing it from build.prop. If you want to check if the prop has been removed use the `getprop` command in a terminal emulator to check. Example: -``` -getprop ro.build.fingerprint -``` -If the prop has been removed, the command should return nothing. - - ## Prop script settings There are a couple of persistent options that you can set for the `props` script. These are currently "Boot stage", "Script colours" and "Fingerprints list check". The options are found under "Script settings" when running the `props` script. The settings menu can also be opened by using the -s option (use -h for details). @@ -370,6 +354,13 @@ If it seems like props you're trying to set with the module don't get set proper This may also be caused by the post-fs-data.sh script being set to run in the background because of the execution taking to long. Try disabling this option in the [script settings](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#prop-script-settings) and see if that changes anything. +### My build.prop doesn't change after setting a custom prop or removing a prop value +Magisk doesn't alter the build.prop file when changing or removing a prop value, it simply loads a new value or prevents the prop to load instead of adding or removing it from build.prop. If you want to check if the prop has been changed use the `getprop` command in a terminal emulator to check. Example: +``` +getprop ro.build.fingerprint +``` +If the prop has been removed, the command should return nothing. + ### My device's Android security patch date changed For some fingerprints it is necessary to also change the security patch date to match the fingerprint used (the actual patch won't change, just the displayed date). This is automatically done by the module when using a fingerprint from a build after March 16 2018. If you do not want this to happen you can manually add `ro.build.version.security_patch` to the custom props and load back the original date, but keep in mind that this may result in the fingerprint not working and SafetyNet will fail. @@ -425,6 +416,11 @@ Releases from v4.0.0 are compatible with Magisk v19+. Releases from v5.0.0 are recommended for Magisk v19.4+. ## Changelog +### v5.1.2 +- Reset current fingerprint if disabling fingerprint modification because of a conflicting module. +- Fixed using the configuration file in /sdcard during boot on FBE encrypted devices. +- Added fingerprint for Huawei P20 (L09 single SIM), Motorola Moto G7 Power, Samsung Galaxy Core Prime and Xiaomi Mi 9 SE. Updated fingerprint for OnePlus 7 Pro NR and Razer Phone 2. List updated to v73. + ### v5.1.1 - Updated the module to conform with the current module installation setup. - Minor updates. @@ -721,7 +717,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. ## Current fingerprints list -### List v72 +### List v73 - Asus Zenfone 2 Laser (6.0.1) - Asus Zenfone 3 Max (7.1.1 & 8.1.0) - Asus Zenfone 4 Max (7.1.1) @@ -772,6 +768,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - Huawei P9 Lite (7.0) - Huawei P9 Plus (7.0) - Huawei P20 (9) +- Huawei P20 Dual SIM (9) - Huawei P20 Lite (8.0.0 & 9) - Huawei P20 Pro (8.1.0 & 9) - Lenovo K6 Note (7.0) @@ -802,6 +799,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - Motorola Moto G6 (9) - Motorola Moto G6 Play (8.0.0 & 9) - Motorola Moto G6 Plus (9) +- Motorola Moto G7 Power (9) - Motorola Moto X4 (8.0.0) - Motorola Moto Z2 Play (8.0.0) - Nextbook Ares 8A (6.0.1) @@ -809,8 +807,8 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - Nokia 7 Plus (9) - Nvidia Shield K1 (7.0) - Nvidia Shield Tablet (7.0) -- Nvidia Shield TV 2017 (8.0.0) -- Nvidia Shield TV Pro (8.0.0) +- Nvidia Shield TV 2017 (8.0.0 & 9) +- Nvidia Shield TV Pro (8.0.0 & 9) - OnePlus One (6.0.1) - OnePlus 2 (6.0.1) - OnePlus X (6.0.1) @@ -829,13 +827,14 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - OPPO Neo 7 A33w (5.1) - OPPO Neo 7 A1603 (5.1) - Razer Phone (8.1.0) -- Razer Phone 2 (8.1.0) +- Razer Phone 2 (8.1.0 & 9) - Samsung Galaxy A3 2015 (6.0.1) - Samsung Galaxy A5 2015 (6.0.1) - Samsung Galaxy A5 2017 (8.0.0) - Samsung Galaxy A51 (10) - Samsung Galaxy A6 Plus (9) - Samsung Galaxy A8 Plus (7.1.1) +- Samsung Galaxy Core Prime (5.1.1) - Samsung Galaxy Grand Prime (5.0.2) - Samsung Galaxy J2 (5.1.1) - Samsung Galaxy J3 (5.1.1) @@ -910,6 +909,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - Xiaomi Mi 8 (8.1.0 & 9) - Xiaomi Mi 9 (9) - Xiaomi Mi 9 Lite (9) +- Xiaomi Mi 9 SE (9) - Xiaomi Mi 9T European (9 & 10) - Xiaomi Mi 9T Global (10) - Xiaomi Mi A1 (8.0.0 & 9) @@ -933,7 +933,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - Xiaomi Redmi 4X (6.0.1) - Xiaomi Redmi 5A (7.1.2 & 8.1.0) - Xiaomi Redmi Go (8.1.0) -- Xiaomi Redmi K20 Pro (9 & 10) +- Xiaomi Redmi K20 Pro/Mi 9T Pro (9 & 10) - Xiaomi Redmi Note 2 (5.0.2) - Xiaomi Redmi Note 3 Pro (6.0.1) - Xiaomi Redmi Note 3 Pro SE (6.0.1) diff --git a/common/prints.sh b/common/prints.sh index d0c269d..d8f92e7 100644 --- a/common/prints.sh +++ b/common/prints.sh @@ -4,7 +4,7 @@ # Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers # Licence: MIT -PRINTSV=72 +PRINTSV=73 PRINTSTRANSF=350 # Certified fingerprints @@ -58,7 +58,8 @@ Huawei P8 Lite (8.0.0)=HUAWEI/PRA-LX1/HWPRA-H:8.0.0/HUAWEIPRA-LX1/401(C432):user Huawei P9 (7.0)=HUAWEI/EVA-L09/HWEVA:7.0/HUAWEIEVA-L09/C432B502:user/release-keys Huawei P9 Lite (7.0)=HUAWEI/VNS-L31/HWVNS-H:7.0/HUAWEIVNS-L31/C432B414:user/release-keys__2018-06-01 Huawei P9 Plus (7.0)=HUAWEI/VIE-L09/HWVIE:7.0/HUAWEIVIE-L09/C432B387:user/release-keys__2018-07-01 -Huawei P20 (9)=HUAWEI/EML-L29/HWEML:9/HUAWEIEML-L29/197C432R1:user/release-keys__2019-01-01 +Huawei P20 (9)=HUAWEI/EML-L09/HWEML:9/HUAWEIEML-L09/9.1.0.345C109:user/release-keys__2019-10-06 +Huawei P20 Dual SIM (9)=HUAWEI/EML-L29/HWEML:9/HUAWEIEML-L29/197C432R1:user/release-keys__2019-01-01 Huawei P20 Lite (8.0.0 & 9)=HUAWEI/ANE-LX1/HWANE:8.0.0/HUAWEIANE-LX1/180(C432):user/release-keys__2019-04-05;HUAWEI/ANE-LX1/HWANE:9/HUAWEIANE-L21/132C432R1:user/release-keys__2019-05-05 Huawei P20 Pro (8.1.0 & 9)=HUAWEI/CLT-L29/HWCLT:8.1.0/HUAWEICLT-L29/128(C432):user/release-keys;HUAWEI/CLT-L09/HWCLT:9/HUAWEICLT-L09/203C432R1:user/release-keys__2019-02-01 Lenovo K6 Note (7.0)=Lenovo/karatep/K53a48:7.0/NRD90N/K53_S228_171114_ROW:user/release-keys @@ -89,6 +90,7 @@ Motorola Moto G5S (7.1.1 & 8.1.0)=motorola/montana/montana:7.1.1/NPPS26.102-49-8 Motorola Moto G6 (9)=motorola/ali/ali:9/PPS29.55-34/0c5d:user/release-keys__2019-02-01 Motorola Moto G6 Play (8.0.0 & 9)=motorola/jeter_sprint/jeter:8.0.0/OCP27.91-23/23:user/release-keys;motorola/aljeter/aljeter:9/PPP29.55-25/08c6:user/release-keys__2019-01-01 Motorola Moto G6 Plus (9)=motorola/evert_amx_n/evert_n:9/PPWS29.116-16-6/5cbfe:user/release-keys__2019-05-01 +Motorola Moto G7 Power (9)=motorola/ocean/ocean:9/PPOS29.114-134-7/d9234:user/release-keys__2019-12-01 Motorola Moto X4 (8.0.0)=motorola/payton/payton:8.0.0/OPWS27.57-25-6-10/12:user/release-keys Motorola Moto Z2 Play (8.0.0)=motorola/albus/albus:8.0.0/OPS27.76-12-25/26:user/release-keys Nextbook Ares 8A (6.0.1)=NextBook/NX16A8116K/NX16A8116K:6.0.1/MMB29M/V4.0.3:user/release-keys @@ -111,18 +113,19 @@ OnePlus 7 GM1901/GM1905 (9)=OnePlus/OnePlus7/OnePlus7:9/PKQ1.190110.001/19072807 OnePlus 7 GM1903 (9)=OnePlus/OnePlus7_EEA/OnePlus7:9/PKQ1.190110.001/1907280700:user/release-keys__2019-08-01 OnePlus 7 Pro GM1911/GM1917 (9 & 10)=OnePlus/OnePlus7Pro/OnePlus7Pro:9/PKQ1.190110.001/1907281556:user/release-keys__2019-08-01;OnePlus/OnePlus7Pro/OnePlus7Pro:10/QKQ1.190716.003/1910071200:user/release-keys__2019-09-05 OnePlus 7 Pro GM1913 (9)=OnePlus/OnePlus7Pro_EEA/OnePlus7Pro:9/PKQ1.190110.001/1907281556:user/release-keys__2019-08-01 -OnePlus 7 Pro NR GM1920 (9)=OnePlus/OnePlus7ProNR_EEA/OnePlus7ProNR:9/PKQ1.190223.001/1909251702:user/release-keys__2019-10-01 +OnePlus 7 Pro NR GM1920 (9)=OnePlus/OnePlus7ProNR_EEA/OnePlus7ProNR:9/PKQ1.190223.001/1912171007:user/release-keys__2019-12-01 OnePlus 7T (10)=OnePlus/OnePlus7T/OnePlus7T:10/QKQ1.190716.003/1909250940:user/release-keys__2019-09-05 OPPO Neo 7 A33w (5.1)=OPPO/A33w/A33w:5.1/LMY47I/1487829433:user/release-keys OPPO Neo 7 A1603 (5.1)=OPPO/A1603/A1603:5.1/LMY47I/1489407760:user/release-keys Razer Phone (8.1.0)=razer/cheryl/cheryl:8.1.0/OPM1.171019.011-RZR-180803/6033:user/release-keys__2018-07-05 -Razer Phone 2 (8.1.0)=razer/cheryl2/aura:8.1.0/O-MR2-RC009-RZR-181124/2009:user/release-keys__2018-10-05 +Razer Phone 2 (8.1.0 & 9)=razer/cheryl2/aura:8.1.0/O-MR2-RC009-RZR-181124/2009:user/release-keys__2018-10-05;razer/cheryl2/aura:9/P-MR2-RC001-RZR-190914/3123:user/release-keys__2019-09-05 Samsung Galaxy A3 2015 (6.0.1)=samsung/a3ultexx/a3ulte:6.0.1/MMB29M/A300FUXXU1CRF1:user/release-keys Samsung Galaxy A5 2015 (6.0.1)=samsung/a5ultexx/a5ulte:6.0.1/MMB29M/A500FUXXU1CPH3:user/release-keys Samsung Galaxy A5 2017 (8.0.0)=samsung/a5y17ltexx/a5y17lte:8.0.0/R16NW/A520FXXUCCSK1:user/release-keys__2019-11-01 Samsung Galaxy A51 (10)=samsung/a51nsxx/a51:10/QP1A.190711.020/A515FXXU1ASKJ:user/release-keys__2019-12-01 Samsung Galaxy A6 Plus (9)=samsung/a6pltedx/a6plte:9/PPR1.180610.011/A605GDXU3BSC6:user/release-keys__2019-03-01 Samsung Galaxy A8 Plus (7.1.1)=samsung/jackpot2ltexx/jackpot2lte:7.1.1/NMF26X/A730FXXU2ARD1:user/release-keys +Samsung Galaxy Core Prime (5.1.1)=samsung/coreprimeveltexx/coreprimevelte:5.1.1/LMY48B/G361FXXU1APB1:user/release-keys Samsung Galaxy Grand Prime (5.0.2)=samsung/fortuna3gdtvvj/fortuna3gdtv:5.0.2/LRX22G/G530BTVJU1BPH4:user/release-keys Samsung Galaxy J2 (5.1.1)=samsung/j23gdd/j23g:5.1.1/LMY48B/J200HXXU0AQK2:user/release-keys Samsung Galaxy J3 (5.1.1)=samsung/j3xnltexx/j3xnlte:5.1.1/LMY47V/J320FNXXU0ARB1:user/release-keys @@ -197,6 +200,7 @@ Xiaomi Mi 6 (8.0.0)=Xiaomi/sagit/sagit:8.0.0/OPR1.170623.027/V9.2.3.0.OCAMIEK:us Xiaomi Mi 8 (8.1.0 & 9)=Xiaomi/dipper/dipper:8.1.0/OPM1.171019.011/V9.5.5.0.OEAMIFA:user/release-keys;Xiaomi/dipper/dipper:9/PKQ1.180729.001/V10.2.3.0.PEAMIXM:user/release-keys__2019-02-01 Xiaomi Mi 9 (9)=Xiaomi/cepheus_eea/cepheus:9/PKQ1.181121.001/V10.2.27.0.PFAEUXM:user/release-keys__2019-06-01 Xiaomi Mi 9 Lite (9)=Xiaomi/pyxis/pyxis:9/PKQ1.181121.001/V11.3.3.0.PFCMIXM:user/release-keys__2019-10-01 +Xiaomi Mi 9 SE (9)=Xiaomi/grus/grus:9/PKQ1.181121.001/V11.0.4.0.PFBMIXM:user/release-keys__2019-10-01 Xiaomi Mi 9T European (9 & 10)=Xiaomi/davinci_eea/davinci:9/PKQ1.190302.001/V10.3.12.0.PFJEUXM:user/release-keys__2019-07-01;Xiaomi/davinci_eea/davinci:10/QKQ1.190825.002/V11.0.1.0.QFJEUXM:user/release-keys__2019-12-01 Xiaomi Mi 9T Global (10)=Xiaomi/davinci/davinci:10/QKQ1.190825.002/V11.0.1.0.QFJMIXM:user/release-keys__2019-12-01 Xiaomi Mi A1 (8.0.0 & 9)=xiaomi/tissot/tissot_sprout:8.0.0/OPR1.170623.026/V.9.5.10.0.ODHMIFA:user/release-keys;xiaomi/tissot/tissot_sprout:9/PKQ1.180917.001/V10.0.4.0.PDHMIXM:user/release-keys__2019-01-05 diff --git a/common/util_functions.sh b/common/util_functions.sh index 49b0002..f05f397 100644 --- a/common/util_functions.sh +++ b/common/util_functions.sh @@ -145,9 +145,9 @@ VR_Patch # Configuration file locations CONFFILELST=" -/data/media/0/propsconf_conf -/data/propsconf_conf -$CACHELOC/propsconf_conf +/data +$CACHELOC +/data/media/0 " # MagiskHide props @@ -373,8 +373,7 @@ get_print_versions() { get_android_version() { VERTMP=$(echo $1 | sed 's|\.||g') if [ "${#VERTMP}" -lt 3 ]; then - until [ "${#VERTMP}" == 3 ] - do + until [ "${#VERTMP}" == 3 ]; do VERTMP="$(echo ${VERTMP}0)" done fi @@ -605,10 +604,21 @@ config_file() { log_handler "Checking for configuration file." CONFFILE="" for ITEM in $CONFFILELST; do - if [ -s "$ITEM" ]; then - CONFFILE="$ITEM" + if [ -s "$ITEM/propsconf_conf" ]; then + CONFFILE="$ITEM/propsconf_conf" break fi + if [ "$ITEM" == "/data/media/0" ]; then + until [ -e "$ITEM/testfbe" ]; do + sleep 1 + touch $ITEM/testfbe + done + rm -f $ITEM/testfbe + if [ -s "$ITEM/propsconf_conf" ]; then + CONFFILE="$ITEM/propsconf_conf" + break + fi + fi done if [ "$CONFFILE" ]; then @@ -644,9 +654,7 @@ config_file() { fi else if [ "$PROPTYPE" == "ro.build.fingerprint" ]; then - if [ "$FINGERPRINTENB" == 1 ]; then - reset_print "$PROPTYPE" "file" - fi + reset_print "$PROPTYPE" "file" else reset_prop "$PROPTYPE" "file" fi @@ -811,7 +819,7 @@ config_file() { # Deletes the configuration file log_handler "Deleting configuration file." for ITEM in $CONFFILELST; do - rm -f $ITEM + rm -f $ITEM/propsconf_conf done log_handler "Configuration file import complete." if [ "$BOOTSTAGE" == "late" ]; then @@ -1085,8 +1093,8 @@ script_install() { # Checks for configuration file CONFFILE="" for ITEM in $CONFFILELST; do - if [ -s "$ITEM" ]; then - CONFFILE="$ITEM" + if [ -s "$ITEM/propsconf_conf" ]; then + CONFFILE="$ITEM/propsconf_conf" break fi done diff --git a/customize.sh b/customize.sh index 9a67f8b..1b36bb3 100644 --- a/customize.sh +++ b/customize.sh @@ -9,12 +9,14 @@ INSTFN=true . $MODPATH/common/util_functions.sh # Print module info -ui_print "$pounds" +ui_print "" +ui_print "************************" ui_print " Installing $MODVERSION " -ui_print " By Didgeridoohan " -ui_print "$pounds" +ui_print " By Didgeridoohan @ XDA " +ui_print "************************" +ui_print "" -# Create install directory +# Create module directory mkdir -pv $MHPCPATH # Start module installation log @@ -27,4 +29,8 @@ log_handler "Starting module installation script" # Module script installation script_install -set_perm $MODPATH/system/$BIN/props 0 0 0755 \ No newline at end of file +# Permission +set_perm $MODPATH/system/$BIN/props 0 0 0755 + +# Remove unused files +rm -f $MODPATH/LICENSE \ No newline at end of file diff --git a/module.prop b/module.prop index d4ecc40..5f85eff 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=MagiskHidePropsConf name=MagiskHide Props Config -version=v5.1.1-v72 -versionCode=51 +version=v5.1.2-v73 +versionCode=52 author=Didgeridoohan description=Change your device's fingerprint, to pass SafetyNet's CTS Profile check. Set/reset prop values set by MagiskHide. Change any prop values easily, and set your own custom props. diff --git a/service.sh b/service.sh index 31be7c3..4968ccb 100644 --- a/service.sh +++ b/service.sh @@ -28,20 +28,26 @@ default_save log_handler "Default values saved to $LATEFILE." # Checks for the Universal SafetyNet Fix module and similar modules editing the device fingerprint -PRINTMODULE=false +TMPUSNF=false for USNF in $USNFLIST; do if [ -d "$MODULESPATH/$USNF" ]; then if [ ! -f "$MODULESPATH/$USNF/disable" ]; then NAME=$(get_file_value $MODULESPATH/$USNF/module.prop "name=") log_handler "Magisk module '$NAME' installed (modifies the device fingerprint)." - PRINTMODULE=true + TMPUSNF=true fi fi done -if [ "$PRINTMODULE" == "true" ]; then +if [ "$TMPUSNF" == "true" ]; then replace_fn FINGERPRINTENB 1 0 $LATEFILE replace_fn PRINTMODULE 0 1 $LATEFILE log_handler "Fingerprint modification disabled." + # Reset current fingerprint if set + if [ "$MODULEFINGERPRINT" ]; then + log_handler "Resetting current fingerprint." + reset_print + force_reboot + fi else replace_fn FINGERPRINTENB 0 1 $LATEFILE replace_fn PRINTMODULE 1 0 $LATEFILE