From 197a403f38867c9033420010441a18e17715cec2 Mon Sep 17 00:00:00 2001
From: Didgeridoohan <Didgeridoohan@users.noreply.github.com>
Date: Mon, 8 Apr 2019 21:44:41 +0200
Subject: [PATCH] v4.0.1-v52

---
 META-INF/com/google/android/update-binary |  2 +-
 README.md                                 | 10 +++-
 common/prints.sh                          |  4 +-
 common/util_functions.sh                  | 72 ++++++++++-------------
 module.prop                               |  4 +-
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
index 2eebc61..08bd14f 100755
--- a/META-INF/com/google/android/update-binary
+++ b/META-INF/com/google/android/update-binary
@@ -7,4 +7,4 @@
 # And replace this script with the downloaded script
 
 # Error, this script should always be replaced
-exit 1
\ No newline at end of file
+exit 1
diff --git a/README.md b/README.md
index 8a2022d..6ae14dc 100644
--- a/README.md
+++ b/README.md
@@ -179,7 +179,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 - v51_**
+**_Current fingerprints list version - v52_**
 
 
 ## Please add support for device X
@@ -368,6 +368,10 @@ Releases from v4.0.0 are compatible with Magisk v19+.
 
 
 ## Changelog
+### v4.0.1  
+- Fixed a bug where the automatic fingerprints update function would always revert to the oldest print available for the set device.
+- Added two new devices to the fingerprints list, Oppo Neo 7 and Xiaomi Mi 9. List updated to v52.
+
 ### v4.0.0  
 - Updated to the new module template. Otherwise the same as v3.5.2, apart from some code cleanup.
 - Due to some of the code cleanup and the new template, this release is only compatible with Magisk v19+. Users not updating to Magisk v19+ can use module v3.5.2.
@@ -613,7 +617,7 @@ Releases from v4.0.0 are compatible with Magisk v19+.
 
 
 ## Current fingerprints list
-### List v51  
+### List v52  
 - Asus Zenfone 2 Laser (6.0.1)
 - Asus Zenfone 4 Max (7.1.1)
 - Asus Zenfone Max M1 (8.0.0)
@@ -685,6 +689,7 @@ Releases from v4.0.0 are compatible with Magisk v19+.
 - OnePlus 5T (8.1.0 & 9)
 - OnePlus 6 (8.1.0 & 9)
 - OnePlus 6T (9)
+- Oppo Neo 7 (5.1)
 - Razer Phone (8.1.0)
 - Razer Phone 2 (8.1.0)
 - Samsung Galaxy A5 2015 (6.0.1)
@@ -753,6 +758,7 @@ Releases from v4.0.0 are compatible with Magisk v19+.
 - Xiaomi Mi 5S Plus (6.0.1 & 7.0)
 - Xiaomi Mi 6 (8.0.0)
 - Xiaomi Mi 8 (8.1.0 & 9)
+- Xiaomi Mi 9 (9)
 - Xiaomi Mi A1 (8.0.0 & 9)
 - Xiaomi Mi A2 (8.1.0 & 9)
 - Xiaomi Mi A2 Lite (9)
diff --git a/common/prints.sh b/common/prints.sh
index db86dae..f2256e3 100644
--- a/common/prints.sh
+++ b/common/prints.sh
@@ -4,7 +4,7 @@
 # Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers
 # Licence: MIT
 
-PRINTSV=51
+PRINTSV=52
 PRINTSTRANSF=350
 
 # Certified fingerprints
@@ -80,6 +80,7 @@ OnePlus 5 (8.1.0 & 9)=OnePlus/OnePlus5/OnePlus5:8.1.0/OPM1.171019.011/1809241512
 OnePlus 5T (8.1.0 & 9)=OnePlus/OnePlus5T/OnePlus5T:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5T/OnePlus5T:9/PKQ1.180716.001/1903112032:user/release-keys__2019-03-01
 OnePlus 6 (8.1.0 & 9)=OnePlus/OnePlus6/OnePlus6:8.1.0/OPM1.171019.011/06140300:user/release-keys;OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1809150000:user/release-keys__2018-09-05
 OnePlus 6T (9)=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1901231231:user/release-keys__2019-01-01
+Oppo Neo7 (5.1)=OPPO/A33w/A33w:5.1/LMY47I/1440568801: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
 Samsung Galaxy A5 2015 (6.0.1)=samsung/a5ultexx/a5ulte:6.0.1/MMB29M/A500FUXXU1CPH3:user/release-keys
@@ -148,6 +149,7 @@ Xiaomi Mi 5S (7.0)=Xiaomi/capricorn/capricorn:7.0/NRD90M/V9.5.4.0.NAGMIFD:user/r
 Xiaomi Mi 5S Plus (6.0.1 & 7.0)=Xiaomi/natrium/natrium:6.0.1/MXB48T/V8.5.2.0.MBGMIED:user/release-keys;Xiaomi/natrium/natrium:7.0/NRD90M/V9.6.2.0.NBGMIFD:user/release-keys
 Xiaomi Mi 6 (8.0.0)=Xiaomi/sagit/sagit:8.0.0/OPR1.170623.027/V9.2.3.0.OCAMIEK:user/release-keys
 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.17.0.PFAEUXM:user/release-keys__2019-03-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
 Xiaomi Mi A2 (8.1.0 & 9)=xiaomi/jasmine/jasmine_sprout:8.1.0/OPM1.171019.011/V9.6.16.0.ODIMIFE:user/release-keys__2018-11-05;xiaomi/jasmine/jasmine_sprout:9/PKQ1.180904.001/V10.0.7.0.PDIMIXM:user/release-keys__2019-03-05
 Xiaomi Mi A2 Lite (9)=xiaomi/daisy/daisy_sprout:9/PKQ1.180917.001/V10.0.1.0.PDLMIFJ:user/release-keys__2018-11-05
diff --git a/common/util_functions.sh b/common/util_functions.sh
index 63dc674..b9c60d0 100644
--- a/common/util_functions.sh
+++ b/common/util_functions.sh
@@ -356,20 +356,7 @@ get_print_versions() {
 
 # Get Android version with 3 digits for input
 get_android_version() {
-	VERTMP=$(echo $1 | sed 's|.||g')
-	if [ "${#VERTMP}" -lt 3 ]; then
-		until [ "${#VERTMP}" == 3 ]
-		do
-			VERTMP="$(echo ${VERTMP}0)"
-		done
-	fi
-	echo $VERTMP
-}
-
-# Get Android version with 3 digits for current fingerprint
-get_android_version_print() {
-	print_parts $1 "var"
-	VERTMP=$(echo $VARRELEASE | sed 's|.||g')
+	VERTMP=$(echo $1 | sed 's|\.||g')
 	if [ "${#VERTMP}" -lt 3 ]; then
 		until [ "${#VERTMP}" == 3 ]
 		do
@@ -1044,7 +1031,7 @@ post_check() {
 devsim_update() {
 	if [ "$MODULEFINGERPRINT" ]; then
 		log_handler "Updating device simulation variables."
-		print_parts $MODULEFINGERPRINT "var"
+		print_parts "$MODULEFINGERPRINT" "var"
 		for ITEM in $PROPSETTINGSLIST; do
 			case $ITEM in
 				SIM*)
@@ -1202,43 +1189,46 @@ print_files() {
 }
 
 device_print_update() {
+	log_handler "$1"
 	if [ "$OPTIONUPDATE" == 1 ]; then
 		if [ "$FINGERPRINTENB" == 1 -o "$PRINTMODULE" == 0 ] && [ "$PRINTEDIT" == 1 ] && [ "$MODULEFINGERPRINT" ]; then
 			TMPDEV="${SIMBRAND}/${SIMNAME}/${SIMDEVICE}"
+			SAVEIFS=$IFS
+			IFS=$(echo -en "\n\b")
 			for ITEM in $PRINTSLIST; do
 				case $ITEM in
 					*$TMPDEV*)
-						TMPPRINT=$ITEM
+						IFS=$SAVEIFS
+						case $ITEM in
+							*\;*)
+								ITEMCOUNT=1
+								ITEMFOUND=0
+								TMPVPRINT="$(get_print_versions "$(get_eq_left "$ITEM")")"
+								TMPVCURR="$(get_android_version $SIMRELEASE)"
+								for V in $TMPVPRINT; do
+									if [ "$(get_android_version $V)" == "$TMPVCURR" ]; then
+										ITEMFOUND=1
+										break
+									fi
+									ITEMCOUNT=$(($ITEMCOUNT+1))
+								done
+								if [ "$ITEMFOUND" == 1 ]; then
+									TMPPRINT="$(get_eq_right "$ITEM" | cut -f $ITEMCOUNT -d ';')"
+								else
+									TMPPRINT=""
+								fi
+							;;
+							*) TMPPRINT="$(get_eq_right "$ITEM")"
+							;;
+						esac
 						break
 					;;
 				esac
 			done
-			case $TMPPRINT in
-				*\;*)
-					ITEMCOUNT=1
-					ITEMFOUND=0
-					TMPVPRINT="$(get_print_versions "$TMPPRINT")"
-					TMPVCURR="$(get_android_version_print $MODULEFINGERPRINT)"
-					for ITEM in $TMPVPRINT; do
-						if [ "$(get_android_version $ITEM)" == "$TMPVCURR" ]; then
-							ITEMFOUND=1
-							break
-						fi
-						ITEMCOUNT=$(($ITEMCOUNT+1))
-					done
-					if [ "$ITEMFOUND" == 1 ]; then
-						TMPPRINT="$(get_eq_right $TMPPRINT | cut -f $ITEMCOUNT -d ';')"
-					else
-						TMPPRINT=""
-					fi
-				;;
-				*) TMPPRINT="$(get_eq_right $TMPPRINT)"
-				;;
-			esac
+			IFS=$SAVEIFS
 			if [ "$TMPDEV" ] && [ "$TMPPRINT" ]; then
-				log_handler "Checking for updated fingerprint ($TMPDEV)."
+				log_handler "Checking for updated fingerprint ($TMPDEV).\nCurrent - $MODULEFINGERPRINT\nUpdate - $TMPPRINT"
 				if [ "$MODULEFINGERPRINT" != "$TMPPRINT" ]; then
-					log_handler "$1"
 					change_print "$1" "$TMPPRINT" "update"
 					replace_fn PRINTCHK 0 1 $LATEFILE
 					# Load module values
@@ -1246,6 +1236,8 @@ device_print_update() {
 				else
 					log_handler "No update available."
 				fi
+			else
+				log_handler "Can't check for update."
 			fi
 		fi
 	fi
diff --git a/module.prop b/module.prop
index 974d1ff..0ed1d7d 100644
--- a/module.prop
+++ b/module.prop
@@ -1,6 +1,6 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v4.0.0-v51
-versionCode=44
+version=v4.0.1-v52
+versionCode=45
 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.