v5.2.3-v79

README.md

@@ -225,7 +225,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 - v78_**
+**_Current fingerprints list version - v79_**
 
 
 ## Please add support for device X
@@ -348,7 +348,7 @@ But first: have you tried turning it off and on again? Toggling MagiskHide off a
 If you have questions, suggestions or are experiencing some kind of issue, visit the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-t3789228) @ XDA.
 
 ### Known issues
-- EdXposed sometimes causes Magisk's boot process to fail, resulting in the module boot scripts (mainly service.sh) not running as they should. Until this has been fixed with EdXposed, there are a couple of ways to work around this. Use the [Configuration file](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#configuration-file) to set everything up during installation, or disable EdXposed before setting the module up and enable it again after the module works as you want it. Just make sure to use the default settings for boot stages.
+For the moment, nothing special (I think). If you've got issues, take a look at the most common problems listed below.
 
 ### props not found
 There are two common reasons why you would get an error saying "not found" when running the `props` command in a terminal emulator.
@@ -451,6 +451,11 @@ Releases from v4.0.0 are compatible with Magisk v19+.
 Releases from v5.0.0 are recommended for Magisk v19.4+.
 
 ## Changelog
+### v5.2.3  
+- Fixed issue with settings transfering between module updates.
+- Use resetprop only to set values and retrieve values with getprop. For whatever reason some devices have issues with resetprop and this might make the module work on those.
+- Updated fingerprints for OnePlus 6, 6T and 7T Pro NR. Fingerprints list updated to v79.
+
 ### v5.2.2  
 - Another quick fix taking care of a weird copy-pasta error that broke manufacturer and model simulation.
 
@@ -770,7 +775,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+.
 
 
 ## Current fingerprints list
-### List v78  
+### List v79  
 - Asus Zenfone 2 Laser ASUS_Z00LD (6.0.1)
 - Asus Zenfone 3 Max ASUS_X00DD (7.1.1 & 8.1.0)
 - Asus Zenfone 4 Max ASUS_X00HD (7.1.1)

common/prints.sh

@@ -4,7 +4,7 @@
 # Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers
 # Licence: MIT
 
-PRINTSV=78
+PRINTSV=79
 PRINTSTRANSF=520
 
 # Certified fingerprints
@@ -116,8 +116,8 @@ OnePlus 3 (8.0.0 & 9):OnePlus:ONEPLUS A3000=OnePlus/OnePlus3/OnePlus3:8.0.0/OPR1
 OnePlus 3T (8.0.0 & 9):OnePlus:ONEPLUS A3003=OnePlus/OnePlus3/OnePlus3T:8.0.0/OPR1.170623.032/1812060016:user/release-keys__2018-11-01;OnePlus/OnePlus3/OnePlus3T:9/PKQ1.181203.001/1911042108:user/release-keys__2019-10-01
 OnePlus 5 (8.1.0 & 9):OnePlus:ONEPLUS A5000=OnePlus/OnePlus5/OnePlus5:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5/OnePlus5:9/PKQ1.180716.001/1912311102:user/release-keys__2019-12-01
 OnePlus 5T (7.1.1 & 8.0.0 & 8.1.0 & 9):OnePlus:ONEPLUS A5010=OnePlus/OnePlus5T/OnePlus5T:7.1.1/NMF26X/12152312:user/release-keys;OnePlus/OnePlus5T/OnePlus5T:8.0.0/OPR1.170623.032/02040656:user/release-keys;OnePlus/OnePlus5T/OnePlus5T:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5T/OnePlus5T:9/PKQ1.180716.001/1912311102:user/release-keys__2019-12-01
-OnePlus 6 (8.1.0 & 9 & 10):OnePlus:ONEPLUS A6003=OnePlus/OnePlus6/OnePlus6:8.1.0/OPM1.171019.011/06140300:user/release-keys;OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1908012000:user/release-keys__2019-08-01;OnePlus/OnePlus6/OnePlus6:10/QKQ1.190716.003/2001151848:user/release-keys__2019-12-01
-OnePlus 6T (9 & 10):OnePlus:ONEPLUS A6013=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1909112330:user/release-keys__2019-08-01;OnePlus/OnePlus6T/OnePlus6T:10/QKQ1.190716.003/2001151848:user/release-keys__2019-12-01
+OnePlus 6 (8.1.0 & 9 & 10):OnePlus:ONEPLUS A6003=OnePlus/OnePlus6/OnePlus6:8.1.0/OPM1.171019.011/06140300:user/release-keys;OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1908012000:user/release-keys__2019-08-01;OnePlus/OnePlus6/OnePlus6:10/QKQ1.190716.003/2002220019:user/release-keys__2020-02-01
+OnePlus 6T (9 & 10):OnePlus:ONEPLUS A6013=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1909112330:user/release-keys__2019-08-01;OnePlus/OnePlus6T/OnePlus6T:10/QKQ1.190716.003/2002220019:user/release-keys__2020-02-01
 OnePlus 6T T-Mobile (9):OnePlus:ONEPLUS A6013=OnePlus/OnePlus6TSingle/OnePlus6TSingle:9/PKQ1.180716.001/1810291147:user/release-keys__2018-11-01
 OnePlus 7 GM1901 (9 & 10):OnePlus:GM1901=OnePlus/OnePlus7/OnePlus7:9/PKQ1.190110.001/1907280700:user/release-keys__2019-08-01;OnePlus/OnePlus7/OnePlus7:10/QKQ1.190716.003/2002021900:user/release-keys__2020-01-01
 OnePlus 7 GM1903 (9 & 10):OnePlus:GM1905=OnePlus/OnePlus7_EEA/OnePlus7:9/PKQ1.190110.001/1907280700:user/release-keys__2019-08-01;OnePlus/OnePlus7_EEA/OnePlus7:10/QKQ1.190716.003/2002021900:user/release-keys__2020-01-01
@@ -134,7 +134,7 @@ OnePlus 7T HD1905 (10):OnePlus:HD1905=OnePlus/OnePlus7T/OnePlus7T:10/QKQ1.190716
 OnePlus 7T Pro HD1911 (10):OnePlus:HD1911=OnePlus/OnePlus7TPro/OnePlus7TPro:10/QKQ1.190716.003/2002022020:user/release-keys__2020-01-01
 OnePlus 7T Pro HD1913 (10):OnePlus:HD1913=OnePlus/OnePlus7TPro_EEA/OnePlus7TPro:10/QKQ1.190716.003/2002022020:user/release-keys__2020-01-01
 OnePlus 7T Pro HD1917 (10):OnePlus:HD1917=OnePlus/OnePlus7TPro/OnePlus7TPro:10/QKQ1.190716.003/2002022020:user/release-keys__2020-01-01
-OnePlus 7T Pro NR HD1925 (10):OnePlus:HD1925=OnePlus/OnePlus7TProNR/OnePlus7TProNR:10/QKQ1.190716.003/2002051152:user/release-keys__2019-12-01
+OnePlus 7T Pro NR HD1925 (10):OnePlus:HD1925=OnePlus/OnePlus7TProNR/OnePlus7TProNR:10/QKQ1.190716.003/2002150222:user/release-keys__2020-02-01
 OPPO Neo 7 A33w (5.1):Oppo:A33w=OPPO/A33w/A33w:5.1/LMY47I/1487829433:user/release-keys
 OPPO Neo 7 A1603 (5.1):Oppo:A1603=OPPO/A1603/A1603:5.1/LMY47I/1489407760:user/release-keys
 Razer Phone (8.1.0):Razer:Phone=razer/cheryl/cheryl:8.1.0/OPM1.171019.011-RZR-180803/6033:user/release-keys__2018-07-05

common/util_functions.sh

@@ -412,7 +412,7 @@ force_reboot() {
 	echo ""
 	echo "${C}Rebooting...${N}"
 	log_handler "Rebooting."
-	[ "$(resetprop sys.boot_completed)" == 1 ] && /system/bin/svc power reboot "" >> $LOGFILE 2>&1 || /system/bin/reboot "" >> $LOGFILE 2>&1 || setprop sys.powerctl reboot >> $LOGFILE 2>&1
+	[ "$(getprop sys.boot_completed)" == 1 ] && /system/bin/svc power reboot "" >> $LOGFILE 2>&1 || /system/bin/reboot "" >> $LOGFILE 2>&1 || setprop sys.powerctl reboot >> $LOGFILE 2>&1
 	sleep 15
 	log_handler "Rebooting failed."
 	echo ""
@@ -486,14 +486,14 @@ orig_check() {
 # Load currently set values
 curr_values() {
 	for ITEM in $VALPROPSLIST; do
-		CURRTMP=$(resetprop -v $ITEM) >> $LOGFILE 2>&1
+		CURRTMP=$(getprop $ITEM) >> $LOGFILE 2>&1
 		TMPPROP=$(get_prop_type $ITEM | tr '[:lower:]' '[:upper:]')
 		eval "CURR${TMPPROP}='$CURRTMP'"
 	done
 	if [ -z "$CURRFINGERPRINT" ]; then
-		CURRFINGERPRINT=$(resetprop -v ro.bootimage.build.fingerprint) >> $LOGFILE 2>&1
+		CURRFINGERPRINT=$(getprop ro.bootimage.build.fingerprint) >> $LOGFILE 2>&1
 		if [ -z "$CURRFINGERPRINT" ]; then
-			CURRFINGERPRINT=$(resetprop -v ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
+			CURRFINGERPRINT=$(getprop ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
 		fi
 	fi
 }
@@ -639,7 +639,7 @@ config_file() {
 			# Check if vendor fingerprint is set
 			if [ "$CONFVENDPRINT" == "true" ]; then
 				log_handler "Using vendor fingerprint"
-				CONFFINGERPRINT=$(resetprop -v ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
+				CONFFINGERPRINT=$(getprop ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
 			fi
 			# Updates prop values (including fingerprint)	
 			PROPSTMPLIST=$PROPSLIST"
@@ -942,6 +942,7 @@ settings_placement() {
 						if [ "$SOLD" ] && [ "$SOLD" != "$SNEW" ]; then
 							log_handler "Setting ${ITEM} from ${SNEW} to ${SOLD}."
 							sed -i "s|${ITEM}=${SNEW}|${ITEM}=${SOLD}|" $UPDATELATEFILE
+							# Change post-fs-data execution between regular and background
 							if [ "$ITEM" == "OPTIONBACK" -a "$SNEW" == 1 ]; then
 								sed -i -e "s|^{|\#anch0}|;s|^\#anch1|{|;s|regular|background|" $MODPATH/post-fs-data.sh
 							fi
@@ -1054,26 +1055,6 @@ files_check() {
 	fi
 }
 
-# Update the device simulation variables if a fingerprint is set
-devsim_update() {
-	if [ "$MODULEFINGERPRINT" ]; then
-		log_handler "Updating device simulation variables."
-		print_parts "$MODULEFINGERPRINT" "var"
-		for ITEM in $PROPSETTINGSLIST; do
-			case $ITEM in
-				SIM*)
-					SUBA="$(get_file_value $LATEFILE "${ITEM}=")"
-					TMPVAR="$(echo $ITEM | sed 's|SIM|VAR|')"
-					TMPPROP="$(eval "echo \$$TMPVAR")"
-					sed -i "s|${ITEM}=\"${SUBA}\"|${ITEM}=\"${TMPPROP}\"|" $LATEFILE
-				;;
-			esac
-		done
-		# Reload module settings
-		load_settings
-	fi
-}
-
 # Load module settings and reapply the MODPATH variable
 load_settings() {
 	log_handler "Loading/reloading module settings."
@@ -1097,7 +1078,6 @@ script_install() {
 	placeholder_update $MODPATH/system/$BIN/props ADBPATH ADB_PLACEHOLDER "$ADBPATH"
 	placeholder_update $MODPATH/system/$BIN/props LATEFILE LATE_PLACEHOLDER "$LATEFILE"
 	load_settings
-	devsim_update
 	print_files
 	ui_print ""
 	ui_print "- Make sure to have Busybox installed."
@@ -1165,14 +1145,14 @@ print_edit() {
 		log_handler "Changing fingerprint."
 		if [ "$PRINTVEND" == 1 ]; then
 			log_handler "Using vendor fingerprint (for Treble GSI ROMs)."
-			PRINTCHNG="$(resetprop ro.vendor.build.fingerprint)"
+			PRINTCHNG="$(getprop ro.vendor.build.fingerprint)"
 			# Set device simulation variables
 			print_parts "$PRINTCHNG"
 		else
 			PRINTCHNG="$(echo $MODULEFINGERPRINT | sed 's|\_\_.*||')"
 		fi
 		# Changing props
-		if [ "$(resetprop "ro.build.fingerprint")" ]; then
+		if [ "$(getprop "ro.build.fingerprint")" ]; then
 			log_handler "Changing/writing ro.build.fingerprint."
 			if [ "$1" ]; then
 				echo "ro.build.fingerprint=${PRINTCHNG}" >> $1
@@ -1456,10 +1436,8 @@ print_parts() {
 			DLIM1=2
 			DLIM2=1
 		fi
-		if [ "$2" != "var" ]; then
-			SUBA=$(get_file_value $LATEFILE "SIM${TMPPROP}=")
-			replace_fn "SIM${TMPPROP}" "\"$SUBA\"" "\"$TMPVALUE\"" $LATEFILE
-		fi
+		SUBA=$(get_file_value $LATEFILE "SIM${TMPPROP}=")
+		replace_fn "SIM${TMPPROP}" "\"$SUBA\"" "\"$TMPVALUE\"" $LATEFILE
 	done
 
 	VARDESCRIPTION=""
@@ -1475,21 +1453,19 @@ print_parts() {
 			esac
 		done
 	fi
-	if [ "$2" != "var" ]; then
-		replace_fn SIMDESCRIPTION "\"$SIMDESCRIPTION\"" "\"$VARDESCRIPTION\"" $LATEFILE
-		replace_fn SIMDISPLAY "\"$SIMDISPLAY\"" "\"$VARDESCRIPTION\"" $LATEFILE
-		replace_fn SIMSDK "\"$SIMSDK\"" "\"$VARSDK\"" $LATEFILE		
-		TMPPARTS=$(get_eq_left "$(grep $1 $PRINTSLOC)" | sed 's|.*)\:||')
-		if [ -z "$TMPPARTS" ]; then
-			TMPPARTS=$(get_eq_left "$(grep $1 $CSTMPRINTS)" | sed 's|.*)\:||')
-		fi
-		if [ $(echo $TMPPARTS | grep -o "\:" | wc -l) == 1 ]; then
-			replace_fn SIMMANUFACTURER "\"$SIMMANUFACTURER\"" "\"$(echo $TMPPARTS | cut -f 1 -d ':')\"" $LATEFILE
-			replace_fn SIMMODEL "\"$SIMMODEL\"" "\"$(echo $TMPPARTS | cut -f 2 -d ':')\"" $LATEFILE
-		else
-			replace_fn SIMMANUFACTURER "\"$SIMMANUFACTURER\"" "\"\"" $LATEFILE
-			replace_fn SIMMODEL "\"$SIMMODEL\"" "\"\"" $LATEFILE
-		fi
+	replace_fn SIMDESCRIPTION "\"$SIMDESCRIPTION\"" "\"$VARDESCRIPTION\"" $LATEFILE
+	replace_fn SIMDISPLAY "\"$SIMDISPLAY\"" "\"$VARDESCRIPTION\"" $LATEFILE
+	replace_fn SIMSDK "\"$SIMSDK\"" "\"$VARSDK\"" $LATEFILE		
+	TMPPARTS=$(get_eq_left "$(grep $1 $PRINTSLOC)" | sed 's|.*)\:||')
+	if [ -z "$TMPPARTS" ]; then
+		TMPPARTS=$(get_eq_left "$(grep $1 $CSTMPRINTS)" | sed 's|.*)\:||')
+	fi
+	if [ $(echo $TMPPARTS | grep -o "\:" | wc -l) == 1 ]; then
+		replace_fn SIMMANUFACTURER "\"$SIMMANUFACTURER\"" "\"$(echo $TMPPARTS | cut -f 1 -d ':')\"" $LATEFILE
+		replace_fn SIMMODEL "\"$SIMMODEL\"" "\"$(echo $TMPPARTS | cut -f 2 -d ':')\"" $LATEFILE
+	else
+		replace_fn SIMMANUFACTURER "\"$SIMMANUFACTURER\"" "\"\"" $LATEFILE
+		replace_fn SIMMODEL "\"$SIMMODEL\"" "\"\"" $LATEFILE
 	fi
 	# Load module values
 	. $LATEFILE
@@ -1510,7 +1486,7 @@ set_partition_props() {
 			else
 				TMPPROP="$(echo "$2" | sed "s|\.${TMPPART}||").${PART}.${TMPPART}"
 			fi
-			if [ "$(resetprop $TMPPROP)" ]; then
+			if [ "$(getprop $TMPPROP)" ]; then
 				log_handler "Changing/writing $TMPPROP."
 				if [ "$1" ]; then
 					echo "${TMPPROP}=${3}" >> $1
@@ -1546,7 +1522,7 @@ dev_sim_edit() {
 				TMPVALUE=$(get_file_value $LATEFILE "SIM${TMPPROP}=")
 				if [ "TMPVALUE" ]; then
 					if [ "$TMPENB" == 1 ] && [ "$TMPVALUE" ]; then
-						if [ "$(resetprop $ITEM)" ]; then
+						if [ "$(getprop $ITEM)" ]; then
 							log_handler "Changing/writing $ITEM."
 							if [ "$1" ]; then
 								echo "${ITEM}=${TMPVALUE}" >> $1
@@ -1964,7 +1940,7 @@ reset_delprop() {
 # Export all settings to a module configuration file
 export_settings() {
 	before_change
-	log_handler "Exporting module settings."
+	log_handler "Exporting module settings to $EXPORTFILE."
 	# Load settings
 	. $LATEFILE
 	# Create export directory
@@ -2042,7 +2018,7 @@ collect_logs() {
 	done
 
 	# Saving the current prop values
-	resetprop > $TMPLOGLOC/currentprops
+	getprop > $TMPLOGLOC/currentprops
 	sed -i -e "s|\]\:\ \[|=|g;s|^\[||g;s|\]$||g" $TMPLOGLOC/currentprops
 
 	# Saving the log file

module.prop

@@ -1,6 +1,6 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v5.2.2-v78
-versionCode=55
+version=v5.2.3-v79
+versionCode=56
 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.

post-fs-data.sh

@@ -40,7 +40,7 @@
 	echo -e $STRST > $RUNFILE 2>&1
 
 	# Save default prop values
-	resetprop > $MHPCPATH/defaultprops
+	getprop > $MHPCPATH/defaultprops
 	echo "" >> $LOGFILE 2>&1
 	echo -e "$(date +"%Y-%m-%d %H:%M:%S:%N") - Saved default values" >> $LOGFILE 2>&1
 

system/binpath/props

@@ -1794,7 +1794,7 @@ menu_edit_custprop() {
 			for ITEM in $CUSTOMPROPSLIST; do
 				TMPITEM=$(echo $(get_eq_right "$ITEM") | sed 's|_sp_| |g')
 				if [ "$(get_eq_left "$ITEM")" == "$1" ]; then
-					if [ "$TMPITEM" == "$(resetprop $1)" ]; then
+					if [ "$TMPITEM" == "$(getprop $1)" ]; then
 						PROPNOTSET=0
 					else
 						PROPNOTSET=1
@@ -1808,7 +1808,7 @@ menu_edit_custprop() {
 			echo "The current value for"
 			echo "${C}'$1'${N} is:"
 			echo ""
-			echo "${C}$(resetprop $1)${N}"
+			echo "${C}$(getprop $1)${N}"
 			if [ "$PROPNOTSET" == 0 ]; then
 				echo "(Set by this module.)"
 				echo ""
@@ -1864,7 +1864,7 @@ menu_edit_custprop() {
 			;;
 			*)
 				if [ "$PROPNOTSET" == 0 ]; then
-					menu_set_custprop "$1" "$INPUT3" "$(resetprop $1)"
+					menu_set_custprop "$1" "$INPUT3" "$(getprop $1)"
 					break
 				else
 					invalid_input 1 3
@@ -1984,7 +1984,7 @@ menu_magiskhide_custprop() {
 # Fourth menu level - Set new custom prop
 menu_set_new_custprop() {
 	INPUT4=""
-	TMPPROP=$(resetprop "$1")
+	TMPPROP=$(getprop "$1")
 	while true
 	do
 		if [ -z "$INPUT4" ]; then
@@ -2461,7 +2461,7 @@ menu_reset_all_delprop() {
 # Fourth menu level - Set new prop to delete
 menu_set_new_delprop() {
 	INPUT4=""
-	TMPPROP=$(resetprop "$1")
+	TMPPROP=$(getprop "$1")
 	while true
 	do
 		if [ -z "$INPUT4" ]; then