diff --git a/README.md b/README.md index ff432ca..b07e345 100644 --- a/README.md +++ b/README.md @@ -244,9 +244,12 @@ If you can't run the `props` script for some reason, the logs are also stored in ## Changelog +### v2.6.1 +- Small fix (revert really) for possible issue with setting prop values (including fingerprint). + ### v2.6.0 -- Updated the fingerprints list to load much, much faster. -- Added and updated fingerprints for Huawei Mate 10, Nextbook Ares 8A, OnePlus 3, 3T, 5 and 5T, ZTE Axon 7. List updated to v33. +- Updated the fingerprints list to load much, much faster. +- Added and updated fingerprints for Huawei Mate 10, Nextbook Ares 8A, OnePlus 3, 3T, 5 and 5T, and ZTE Axon 7. List updated to v33. - The new and improved SafetyNet fix turns out to be not only for Android Pie. Gone through the entire list and added security patch dates where needed. - Fixed some seriously botched code in v2.5.0. - As usual, small bug fixes and improvemnts. diff --git a/common/propsconf_conf b/common/propsconf_conf index 4b4a301..f538b8f 100644 --- a/common/propsconf_conf +++ b/common/propsconf_conf @@ -33,7 +33,7 @@ CONFWEB=enabled # CONFFINGERPRINT should be set to the fingerprint of a ROM that passes # the ctsProfile check. See the prints.sh file for usable prints, # or the documentation for information on how to find one. -# Note that Android Pie fingerprints often also need to match the Android +# Note that Android builds after March 16 2018 often also need to match the Android # security patch date. Use the CONFPROPS setting to set ro.build.version.security_patch # to the matching date (example: 2018-10-05). diff --git a/common/propsconf_late b/common/propsconf_late index d577a76..ef4ff6a 100644 --- a/common/propsconf_late +++ b/common/propsconf_late @@ -9,7 +9,7 @@ # In that case, feel free to delete it. # Script version -SCRIPTV=15 +SCRIPTV=16 SETTRANSF=2 NOTTRANSF="OPTIONLATE" @@ -133,33 +133,31 @@ if [ -d "$MODPATH" ]; then SETFINGERPRINT=false # Edits prop values if set for late_start service - if [ "$OPTIONLATE" == 1 ] || [ "$CUSTOMPROPSLATE" -a "$CUSTOMEDIT" == 1 ] || [ "$PROPEDIT" == 1 ]; then - echo -e "\n--------------------" >> $LOGFILE 2>&1 - log_handler "Editing prop values in late_start service mode." - if [ "$OPTIONLATE" == 1 ]; then - # ---Setting/Changing fingerprint--- - print_edit - # ---Setting custom props--- - custom_edit "CUSTOMPROPS" - fi - # Edit custom props set for late_start service - custom_edit "CUSTOMPROPSLATE" - # Edit MagiskHide sensitive values - if [ "$PROPEDIT" == 1 ]; then - log_handler "Changing sensitive props." - for ITEM in $PROPSLIST; do - PROP=$(get_prop_type $ITEM) - REPROP=$(echo "RE${PROP}" | tr '[:lower:]' '[:upper:]') - MODULEPROP=$(echo "MODULE${PROP}" | tr '[:lower:]' '[:upper:]') - if [ "$(eval "echo \$$REPROP")" == "true" ]; then - log_handler "Changing/writing $ITEM." - resetprop -v $ITEM >> $LOGFILE 2>&1 - resetprop -nv $ITEM $(eval "echo \$$MODULEPROP") >> $LOGFILE 2>&1 - fi - done - fi - echo -e "\n--------------------" >> $LOGFILE 2>&1 + echo -e "\n--------------------" >> $LOGFILE 2>&1 + log_handler "Editing prop values in late_start service mode." + if [ "$OPTIONLATE" == 1 ]; then + # ---Setting/Changing fingerprint--- + print_edit + # ---Setting custom props--- + custom_edit "CUSTOMPROPS" fi + # Edit custom props set for late_start service + custom_edit "CUSTOMPROPSLATE" + # Edit MagiskHide sensitive values + if [ "$PROPEDIT" == 1 ]; then + log_handler "Changing sensitive props." + for ITEM in $PROPSLIST; do + PROP=$(get_prop_type $ITEM) + REPROP=$(echo "RE${PROP}" | tr '[:lower:]' '[:upper:]') + MODULEPROP=$(echo "MODULE${PROP}" | tr '[:lower:]' '[:upper:]') + if [ "$(eval "echo \$$REPROP")" == "true" ]; then + log_handler "Changing/writing $ITEM." + resetprop -v $ITEM >> $LOGFILE 2>&1 + resetprop -nv $ITEM $(eval "echo \$$MODULEPROP") >> $LOGFILE 2>&1 + fi + done + fi + echo -e "\n--------------------" >> $LOGFILE 2>&1 # ---Edits default.prop--- if [ "$DEFAULTEDIT" == 1 ] && [ "$FILESAFE" == 0 ]; then diff --git a/common/propsconf_post b/common/propsconf_post index 7c2c633..2dc3838 100644 --- a/common/propsconf_post +++ b/common/propsconf_post @@ -79,21 +79,19 @@ if [ -d "$MODPATH" ]; then config_file # Edits prop values if set for post-fs-data - if [ "$(get_file_value $LATEFILE "OPTIONLATE=")" == 0 ] || [ "$(get_file_value $LATEFILE "CUSTOMPROPSPOST=")" ] && [ "$(get_file_value $LATEFILE "CUSTOMEDIT=")" == 1 ]; then - echo -e "\n--------------------" >> $LOGFILE 2>&1 - log_handler "Editing prop values in post-fs-data mode." - if [ "$(get_file_value $LATEFILE "OPTIONLATE=")" == 0 ]; then - # ---Setting/Changing fingerprint--- - print_edit - # ---Setting custom props--- - custom_edit "CUSTOMPROPS" - fi - # Edit custom props set for post-fs-data - custom_edit "CUSTOMPROPSPOST" - echo -e "\n--------------------" >> $LOGFILE 2>&1 + echo -e "\n--------------------" >> $LOGFILE 2>&1 + log_handler "Editing prop values in post-fs-data mode." + if [ "$(get_file_value $LATEFILE "OPTIONLATE=")" == 0 ]; then + # ---Setting/Changing fingerprint--- + print_edit + # ---Setting custom props--- + custom_edit "CUSTOMPROPS" fi # Deleting props prop_del + # Edit custom props set for post-fs-data + custom_edit "CUSTOMPROPSPOST" + echo -e "\n--------------------" >> $LOGFILE 2>&1 # Edits build.prop if [ "$(get_file_value $LATEFILE "FILESAFE=")" == 0 ]; then diff --git a/module.prop b/module.prop index c4fa7b0..ef1f70e 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=MagiskHidePropsConf name=MagiskHide Props Config -version=v2.6.0-v33 -versionCode=28 +version=v2.6.1-v33 +versionCode=29 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. Change any prop values easily, and set your own custom props. minMagisk=17000