From 1671e0c4e677981a7bb0f4c86d1a621970892900 Mon Sep 17 00:00:00 2001
From: Didgeridoohan <github@heptadecagon.one>
Date: Wed, 23 Sep 2020 10:30:49 +0200
Subject: [PATCH] v5.3.5

---
 README.md                |   5 +++++
 common/util_functions.sh |  22 ++++++++++++----------
 module.prop              |   4 ++--
 service.sh               |   2 +-
 system/binpath/props     | Bin 98574 -> 98622 bytes
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 01d76e6..01f93a4 100644
--- a/README.md
+++ b/README.md
@@ -504,6 +504,11 @@ Releases from v5.0.0 are recommended for Magisk v19.4+.
 Releases from v5.2.5 will only install on Magisk v20+.
 
 ## Changelog
+### v5.3.5  
+- Fixed issue with partition model props not being set correctly.
+- Make sure that simulating ro.product.model is completely disabled when enabling "Force BASIC key attestation".
+- Removed Android versions from the device list when picking a model for "Force BASIC key attestation".
+
 ### v5.3.4  
 - Added a module update check option. See the documentation for details.
 - Added `system_ext` to the list of partitions used for certain props (thank you @simonsmh).
diff --git a/common/util_functions.sh b/common/util_functions.sh
index 208d638..5335990 100644
--- a/common/util_functions.sh
+++ b/common/util_functions.sh
@@ -1259,7 +1259,7 @@ print_edit() {
 			if [ "$1" != "none" ]; then
 				echo "ro.build.fingerprint=${PRINTCHNG}" >> $1
 			else
-				resetprop -nv ro.build.fingerprint $PRINTCHNG >> $LOGFILE 2>&1
+				resetprop -nv ro.build.fingerprint "$PRINTCHNG" >> $LOGFILE 2>&1
 			fi
 		else
 			log_handler "ro.build.fingerprint not currently set on device. Skipping."
@@ -1295,7 +1295,7 @@ patch_edit() {
 					if [ "$1" != "none" ]; then
 						echo "ro.build.version.security_patch=${SECPATCH}" >> $1
 					else
-						resetprop -nv ro.build.version.security_patch $SECPATCH >> $LOGFILE 2>&1
+						resetprop -nv ro.build.version.security_patch "$SECPATCH" >> $LOGFILE 2>&1
 					fi
 				fi
 			;;
@@ -1616,7 +1616,7 @@ set_partition_props() {
 				if [ "$1" != "none" ]; then
 					echo "${TMPPROP}=${3}" >> $1
 				else
-					resetprop -nv $TMPPROP $3 >> $LOGFILE 2>&1
+					resetprop -nv $TMPPROP "$3" >> $LOGFILE 2>&1
 				fi
 			else
 				log_handler "$TMPPROP not currently set on device. Skipping."
@@ -1640,15 +1640,15 @@ forced_basic() {
 	else
 		BASICATTDEV="$(getprop ro.product.brand)"
 	fi
-  if [ "$BASICATTCUST" ]; then
+	if [ "$BASICATTCUST" ]; then
 		BASICATTMODEL=$BASICATTCUST
-  elif [ "$BASICATTLIST" ]; then
+	elif [ "$BASICATTLIST" ]; then
 		BASICATTMODEL=$BASICATTLIST
-  else
+	else
 		# Find the OEM print file
 		TMPFILE="$(ls $MODPATH/printfiles | grep -i $BASICATTDEV)"
 		BASICATTMODEL="$(get_file_value "$MODPATH/printfiles/$TMPFILE" "BASICATTMODEL=")"
-  fi
+	fi
 	# Write or load values
 	if [ "$1" != "none" ]; then
 		if [ "$1" == "$MODPATH/system.prop" ]; then
@@ -1663,6 +1663,8 @@ forced_basic() {
 			TMPVAL=1
 			if [ "$BASICATTEST" == 0 ]; then
 				log_handler "Enabling forced basic attestation."
+				# Disabling ro.product.model simulation
+				replace_fn "MODELSET" $MODELSET 0 $LATEFILE
 			elif [ "$BASICATTEST" == 1 ] && [ -z "$2" ] && [ -z "$3" ] && [ "$4" != "reset" ]; then
 				TMPVAL=0
 				log_handler "Disabling forced basic attestation."
@@ -1681,7 +1683,7 @@ forced_basic() {
 		else
 			TMPVAL="$(getprop ro.product.device)"
 		fi
-		resetprop -nv ro.product.model $TMPVAL >> $LOGFILE 2>&1
+		resetprop -nv ro.product.model "$TMPVAL" >> $LOGFILE 2>&1
 		set_partition_props "none" "ro.product.model" "$TMPVAL"
 	fi
 }
@@ -1744,13 +1746,13 @@ dev_sim_edit() {
 							if [ "$1" != "none" ]; then
 								echo "${ITEM}=${TMPVALUE}" >> $1
 							else
-								resetprop -nv $ITEM $TMPVALUE >> $LOGFILE 2>&1
+								resetprop -nv $ITEM "$TMPVALUE" >> $LOGFILE 2>&1
 							fi
 						else
 							log_handler "$ITEM not currently set on device. Skipping."
 						fi
 						if [ "$PARTPROPSSET" == 1 ]; then
-							set_partition_props $1 $ITEM $TMPVALUE
+							set_partition_props "$1" $ITEM "$TMPVALUE"
 						fi
 					else
 						log_handler "Changing/writing $ITEM is disabled."
diff --git a/module.prop b/module.prop
index 193f618..8fcb5c8 100644
--- a/module.prop
+++ b/module.prop
@@ -1,6 +1,6 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v5.3.4-v104
-versionCode=65
+version=v5.3.5-v104
+versionCode=66
 author=Didgeridoohan
 description=Change your device's fingerprint, and/or force basic attestation, 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 7cde270..56418de 100644
--- a/service.sh
+++ b/service.sh
@@ -109,7 +109,7 @@ if [ "$PROPEDIT" == 1 ]; then
 		MODULEPROP=$(echo "MODULE${PROP}" | tr '[:lower:]' '[:upper:]')
 		if [ "$(eval "echo \$$REPROP")" == "true" ]; then
 			log_handler "Changing/writing $ITEM."
-			resetprop -nv $ITEM $(eval "echo \$$MODULEPROP") >> $LOGFILE 2>&1
+			resetprop -nv $ITEM "$(eval "echo \$$MODULEPROP")" >> $LOGFILE 2>&1
 		fi
 	done
 	stop
diff --git a/system/binpath/props b/system/binpath/props
index 53cba5b63c763a0aadb89d760cc7e5c8b74ca30d..a01fe9830b011024ebd4e0aa84beaefe139423ce 100644
GIT binary patch
delta 83
zcmeBcV%yimwm~&RP@zVlI5kB<sklZ#Lr+Vyre^bco$rjBrL)e;bLyrlC@Fxz<d>aV
lqAJxvwJDj!iAg!BDJs=|wR)OLT%6Mx6&Qs#t9HHo1^|Yb8>s*Q

delta 41
xcmdnj#Maluwm~&x^9G%7jGJ|{&dM_?O=j-W;!4RZPE5*4P0`cb?A!J68vs|t5X}Gp