v2.6.3-v34

README.md

@@ -70,7 +70,7 @@ Take a look below for an example of what a device fingerprint looks like.
 Sometimes you can also find up to date and certified fingerprints at [firmware.mobi](https://desktop.firmware.mobi/).
 
 ### Custom fingerprints list
-You can add your own fingerprint to the list by placing a file, named `printslist` (no file extension), in the root of your internal storage with the fingerprint. It needs to be formated as follows: `device name=fingerprint`.
+You can add your own fingerprint to the list by placing a file, named `printslist` (no file extension), in the root of your internal storage with the fingerprints. It needs to be formated as follows: `device name=fingerprint`. The fingerprints added to this list will be found under the `Custom` category in the fingerprints menu.
 Here's an example:
 ```
 Google Nexus 6=google/shamu/shamu:7.1.1/N8I11B/4171878:user/release-keys
@@ -105,7 +105,7 @@ The fingerprints list will update without the need to update the entire module.
 
 Just run the `props` command and the list will be updated automatically. Use the -nw option to disable or disable it completely in the script settings (see ["Prop script settings"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#prop-script-settings) below). If you've disabled the this setting you can update the list manually in the `Edit device fingerprint` menu.
 
-**_Current fingerprints list version - v33_**
+**_Current fingerprints list version - v34_**
 
 
 ## Please add support for device X
@@ -244,6 +244,11 @@ If you can't run the `props` script for some reason, the logs are also stored in
 
 
 ## Changelog
+### v2.6.3  
+- Fixed custom fingerprints list that broke with the fingerprints list optimisation in v2.5.0.
+- Added fingerprints for Huawei P9 Plus and HTC U12 Plus. List updated to v34.
+- Minor improvements.
+
 ### v2.6.2  
 - Another quick fix. Keep 'em coming...
 
@@ -409,7 +414,7 @@ If you can't run the `props` script for some reason, the logs are also stored in
 
 
 ## Current fingerprints list
-### List v33  
+### List v34  
 - Asus Zenfone 2 Laser (6.0.1)
 - Asus Zenfone 4 Max (7.1.1)
 - Asus ZenPad S 8.0 (6.0.1)
@@ -427,12 +432,14 @@ If you can't run the `props` script for some reason, the logs are also stored in
 - Google Pixel 3 XL (9)
 - HTC 10 (6.0.1)
 - HTC U11 (8.0.0)
+- HTC U12 Plus (8.0.0)
 - Huawei Honor 6X (8.0.0)
 - Huawei Honor 9 (8.0.0)
 - Huawei Mate 10 (8.0.0)
 - Huawei Mate 10 Pro (8.0.0)
 - Huawei P8 Lite (8.0.0)
 - Huawei P9 (7.0)
+- Huawei P9 Plus (7.0)
 - Huawei P20 Pro (8.1.0)
 - LeEco Le Pro3 (6.0.1)
 - LG G2 BS980 (5.0.2)

common/prints.sh

@@ -3,11 +3,9 @@
 # MagiskHide Props Config
 # By Didgeridoohan @ XDA Developers
 
-PRINTSV=33
+PRINTSV=34
 PRINTSTRANSF=250
 
-PRINTSFILE=/sdcard/printslist
-
 # Certified fingerprints
 PRINTSLIST="
 Asus Zenfone 2 Laser (6.0.1)=asus/WW_Z00L/ASUS_Z00L_63:6.0.1/MMB29P/WW_user_21.40.1220.2196_20180308:user/release-keys
@@ -27,12 +25,14 @@ Google Pixel 3 (9)=google/blueline/blueline:9/PD1A.180720.030/4972053:user/relea
 Google Pixel 3 XL (9)=google/crosshatch/crosshatch:9/PD1A.180720.030/4972053:user/release-keys__2018-09-05
 HTC 10 (6.0.1)=htc/HTCOneM10vzw/htc_pmewl:6.0.1/MMB29M/774095.8:user/release-keys
 HTC U11 (8.0.0)=htc/ocndtwl_01405/htc_ocndtwl:8.0.0/OPR6.170623.013/1017190.2:user/release-keys
+HTC U12 Plus (8.0.0)=htc/imeuhl_00617/htc_imeuhl:8.0.0/OPR1.170623.032/1041457.3:user/release-keys__2018-06-01
 Huawei Honor 6X (8.0.0)=HONOR/BLN-AL10/HWBLN-H:8.0.0/HONORBLN-AL10/528(C00):user/release-keys
 Huawei Honor 9 (8.0.0)=HONOR/STF-L09/HWSTF:8.0.0/HUAWEISTF-L09/364(C432):user/release-keys
 Huawei Mate 10 (8.0.0)=HUAWEI/ALP-L29/HWALP:8.0.0/HUAWEIALP-L29S/143(C636):user/release-keys__2018-10-01
 Huawei Mate 10 Pro (8.0.0)=HUAWEI/BLA-L29/HWBLA:8.0.0/HUAWEIBLA-L29S/137(C432):user/release-keys
 Huawei P8 Lite (8.0.0)=HUAWEI/PRA-LX1/HWPRA-H:8.0.0/HUAWEIPRA-LX1/367(C432):user/release-keys
 Huawei P9 (7.0)=HUAWEI/EVA-L09/HWEVA:7.0/HUAWEIEVA-L09/C432B502:user/release-keys
+Huawei P9 Plus (7.0)=HUAWEI/VIE-L09/HWVIE:7.0/HUAWEIVIE-L09/C432B387:user/release-keys__2018-07-01
 Huawei P20 Pro (8.1.0)=HUAWEI/CLT-L29/HWCLT:8.1.0/HUAWEICLT-L29/128(C432):user/release-keys
 LeEco Le Pro3 (6.0.1)=LeEco/ZL1_NA/le_zl1:6.0.1/WEXNAOP5802101261S/letv01261206:user/release-keys
 LG G2 BS980 (5.0.2)=lge/g2_vzw/g2:5.0.2/LRX22G/15046001715f9:user/release-keys
@@ -135,12 +135,3 @@ ZTE Blade (6.0.1)=ZTE/P809A50_MY_MAX/P809A50:6.0.1/MMB29M/20161017.095504:user/r
 ZTE Nubia Z17 (7.1.1)=nubia/NX563J/NX563J:7.1.1/NMF26X/eng.nubia.20171019.101529:user/release-keys
 Zuk Z2 Pro (7.0)=ZUK/z2_row/z2_row:7.0/NRD90M/2.5.435_170525:user/release-keys
 "
-
-if [ -f "$PRINTSFILE" ]; then
-	FLINE=$(head -1 $PRINTSFILE)
-	if [ "$FLINE" ]; then
-		sed -i '1s/^/\n/' $PRINTSFILE
-	fi
-	LISTFILE=$(cat $PRINTSFILE)
-	PRINTSLIST=$PRINTSLIST$LISTFILE
-fi

common/propsconf_late

@@ -9,7 +9,7 @@
 # In that case, feel free to delete it.
 
 # Script version
-SCRIPTV=16
+SCRIPTV=17
 SETTRANSF=2
 NOTTRANSF="OPTIONLATE"
 
@@ -98,6 +98,7 @@ if [ -d "$MODPATH" ]; then
 			ORIGTAGS=""
 			ORIGSELINUX=""
 			ORIGFINGERPRINT=""
+			ORIGPATCH=""
 
 			# ---Module values---
 			MODULEDEBUGGABLE=""

common/propsconf_post

@@ -68,6 +68,7 @@ if [ -d "$MODPATH" ]; then
 			replace_fn ORIGTAGS "\"$ORIGTAGS\"" "\"$CURRTAGS\"" $LATEFILE
 			replace_fn ORIGSELINUX "\"$ORIGSELINUX\"" "\"$CURRSELINUX\"" $LATEFILE
 			replace_fn ORIGFINGERPRINT "\"$ORIGFINGERPRINT\"" "\"$CURRFINGERPRINT\"" $LATEFILE
+			replace_fn ORIGPATCH "\"$ORIGPATCH\"" "\"$CURRPATCH\"" $LATEFILE
 			log_handler "Default values saved to $LATEFILE."
 			# Loading the new values
 			orig_values

common/util_functions.sh

@@ -47,7 +47,10 @@ alias wget="$BBPATH wget"
 PRINTSLOC=$MODPATH/prints.sh
 PRINTSTMP=$CACHELOC/prints.sh
 PRINTSWWW="https://raw.githubusercontent.com/Magisk-Modules-Repo/MagiskHide-Props-Config/master/common/prints.sh"
+PRINTSDEV="https://raw.githubusercontent.com/Didgeridoohan/Playground/master/prints.sh"
 PRINTFILES=$MODPATH/printfiles
+CSTMPRINTS=/sdcard/printslist
+CSTMFILE=$PRINTFILES/Custom.sh
 BIN=BIN_PLACEHOLDER
 USNFLIST=USNF_PLACEHOLDER
 
@@ -76,6 +79,11 @@ ro.bootimage.build.fingerprint
 ro.vendor.build.fingerprint
 "
 
+# Additional SafetyNet props
+SNPROPS="
+ro.build.version.security_patch
+"
+
 # Finding file values
 get_file_value() {
 	if [ -f "$1" ]; then
@@ -247,6 +255,7 @@ curr_values() {
 			CURRFINGERPRINT=$(resetprop -v ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
 		fi
 	fi
+	CURRPATCH=$(resetprop -v ro.build.version.security_patch) >> $LOGFILE 2>&1
 }
 
 # Load original values
@@ -257,6 +266,7 @@ orig_values() {
 	ORIGTAGS=$(get_file_value $LATEFILE "ORIGTAGS=")
 	ORIGSELINUX=$(get_file_value $LATEFILE "ORIGSELINUX=")
 	ORIGFINGERPRINT=$(get_file_value $LATEFILE "ORIGFINGERPRINT=")
+	ORIGPATCH=$(get_file_value $LATEFILE "ORIGPATCH=")
 }
 
 # Load module values
@@ -544,7 +554,7 @@ download_prints() {
 		clear
 	fi
 	if [ "$1" == "Dev" ]; then
-		PRINTSWWW="https://raw.githubusercontent.com/Didgeridoohan/Playground/master/prints.sh"
+		PRINTSWWW=$PRINTSDEV
 	fi
 	menu_header "Updating fingerprints list"
 	echo ""

module.prop

@@ -1,7 +1,7 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v2.6.2-v33
-versionCode=30
+version=v2.6.3-v34
+versionCode=31
 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

system/binpath/props

@@ -1,4 +1,4 @@
- #!/system/bin/sh
+#!/system/bin/sh
 
 # MagiskHide Props Config
 # By Didgeridoohan @ XDA Developers
@@ -208,6 +208,7 @@ exit_fn() {
 # ======================== Device's fingerprint ========================
 # Second menu level - fingerprint
 menu_change_fingerprint() {
+	rm -f $CSTMFILE
 	INPUT2=""
 	while true
 	do
@@ -307,18 +308,51 @@ menu_pick_print() {
 	while true
 	do
 		if [ -z "$INPUT3" ]; then
+			# Load the list of fingerprint files
+			log_handler "Loading fingerprints list v$(get_file_value $PRINTSLOC "PRINTSV=")."
 			OEMLIST="$(ls $PRINTFILES | sed 's|\.sh||g')"
-			ITEMCOUNT=1
-			menu_header "${C}$1${N}\n List version - v$(get_file_value $PRINTSLOC "PRINTSV=")\n Select an option below."
-			echo ""
-			for ITEM in $OEMLIST; do
-				echo "${G}$ITEMCOUNT${N} - $ITEM"
-				ITEMCOUNT=$(($ITEMCOUNT+1))
-			done
-			echo "${G}b${N} - Go back"
-			echo ""
-			echo -n "Enter '${G}e${N}' to exit: "
-			read -r INPUT3
+			if [ "$OEMLIST" ]; then
+				# Check for custom fingerprints list
+				if [ -f "$CSTMPRINTS" ] && [ ! -f "$CSTMFILE" ]; then
+					log_handler "Found custom fingerprints list."
+					log_handler "Creating custom prints file."
+					cat $CSTMPRINTS >> $LOGFILE > 2>&1 && echo "" >> $LOGFILE > 2>&1
+					echo -e "PRINTSLIST=\"" >> $CSTMFILE
+					cat $CSTMPRINTS >> $CSTMFILE
+					echo -e "\"" >> $CSTMFILE
+					# Reload the list with new files
+					OEMLIST="$(ls $PRINTFILES | sed 's|\.sh||g')"
+				fi
+				ITEMCOUNT=1
+				menu_header "${C}$1${N}\n List version - v$(get_file_value $PRINTSLOC "PRINTSV=")\n Select an option below."
+				echo ""
+				for ITEM in $OEMLIST; do
+					echo "${G}$ITEMCOUNT${N} - $ITEM"
+					ITEMCOUNT=$(($ITEMCOUNT+1))
+				done
+				echo "${G}b${N} - Go back"
+				echo ""
+				echo -n "Enter '${G}e${N}' to exit: "
+				read -r INPUT3
+			else
+				log_handler "No fingerprints list."
+				collect_logs "issue"
+				echo "Hm... That's not right."
+				echo ""
+				echo "There is currently no fingerprints list"
+				echo "available. Try updating it manually."
+				echo ""
+				echo "If the issue persists, report it in the"
+				echo "support thread @ XDA, ${R}with logs!${C}"
+				echo ""
+				echo "Logs have automatically been saved to"
+				echo "your internal storage ${R}(propslogs.tar.gz)${C}."
+				echo ""
+				echo -n "Press enter to continue..."
+				read -r INPUTTMP
+				INPUT2=""
+				break
+			fi
 		fi
 		if [ "$INPUT3" -ge 1 ] && [ "$INPUT3" -le "$ITEMCOUNT" ]; then
 			ITEMCOUNT=1
@@ -343,8 +377,29 @@ menu_pick_print() {
 # Fourth menu level - pick fingerprint
 menu_pick_print_sub() {
 	# Loading fingerprints
-	. ${PRINTFILES}/${2}\.sh
-	INPUT4=""
+	TMPFILE=$PRINTFILES/$2.sh
+	if [ -f "$TMPFILE" ]; then
+		. $TMPFILE
+		INPUT4=""
+	else
+		menu_header "${C}$1${N}\n List version - v$(get_file_value $PRINTSLOC "PRINTSV=")\n Select an option below."
+		log_handler "Can't find '$TMPFILE'."
+		collect_logs "issue"
+		echo "Oh no! Something went wrong..."
+		echo ""
+		echo "Can't find the fingerprints file."
+		echo "Try updating it manually."
+		echo ""
+		echo "If the issue persists, report it in the"
+		echo "support thread @ XDA, ${R}with logs!${C}"
+		echo ""
+		echo "Logs have automatically been saved to"
+		echo "your internal storage ${R}(propslogs.tar.gz)${C}."
+		echo ""
+		echo -n "Press enter to continue..."
+		read -r INPUTTMP
+		INPUT4="b"
+	fi
 	while true
 	do
 		if [ -z "$INPUT4" ]; then
@@ -354,7 +409,7 @@ menu_pick_print_sub() {
 			SAVEIFS=$IFS
 			IFS=$(echo -en "\n\b")
 			for ITEM in $PRINTSLIST; do
-				if [ "$(get_first $ITEM)" == "$2" ]; then
+				if [ "$(get_first $ITEM)" == "$2" ] || [ "$2" == "Custom" ]; then
 					echo "${G}$ITEMCOUNT${N} - $(get_eq_left "$ITEM")"
 					ITEMCOUNT=$(($ITEMCOUNT+1))
 				fi
@@ -370,13 +425,11 @@ menu_pick_print_sub() {
 			SAVEIFS=$IFS
 			IFS=$(echo -en "\n\b")
 			for ITEM in $PRINTSLIST; do
-				if [ "$(get_first $ITEM)" == "$2" ] && [ "$ITEMCOUNT" == "$INPUT4" ]; then
+				if [ "$ITEMCOUNT" == "$INPUT4" ]; then
 					menu_new_print "$1" $(get_eq_right "$ITEM")					
 					break
 				fi
-				if [ "$(get_first "$ITEM")" == "$2" ]; then
-					ITEMCOUNT=$(($ITEMCOUNT+1))
-				fi
+				ITEMCOUNT=$(($ITEMCOUNT+1))
 			done
 			IFS=$SAVEIFS
 		elif [ "$INPUT4" == "b" ] || [ "$INPUT4" == "B" ]; then