v2.7.1-v39

README.md

@@ -156,7 +156,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 - v38_**
+**_Current fingerprints list version - v39_**
 
 
 ## Please add support for device X
@@ -310,6 +310,11 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 
 
 ## Changelog
+### v2.7.1  
+- Fixed an issue when users create custom prints list and configuration files with Windows file endings.
+- Fixed an issue where the currently picked device wouldn't show for the custom prints list.
+- Added fingerprints for Sony Xperia Z4 Tablet LTE and Xiaomi Mi A2 & Redmi Y1. Updated fingerprints for Essential PH-1, Google Nexus 5X & 6P, Pixel 1-3 (both regular and XL) & C and Sony Xperia XZ1 Compact. List updated to v39.
+
 ### v2.7.0  
 - Updated Busybox logic (again). It is now required to install Busybox alongside the module, to ensure proper functionality. I recommend @osm0sis' Busybox, installable as a Magisk module from the Magisk repo.
 - Added fingerprints for Google Nexus 7 (2012 & 2013, WiFi & LTE), Nexus 9 (WiFi & LTE) and Pixel C, LG V30, Motorola Moto E5 Plus, OnePlus 6T, Samsung Galaxy J7 Prime and S5, and Xiaomi Mi 8. Updated the fingerprint for Huawei P8 Lite and Xiaomi Mi Mix 2s. List updated to v38.
@@ -494,7 +499,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 
 
 ## Current fingerprints list
-### List v38  
+### List v39  
 - Asus Zenfone 2 Laser (6.0.1)
 - Asus Zenfone 4 Max (7.1.1)
 - Asus ZenPad S 8.0 (6.0.1)
@@ -604,6 +609,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 - Sony Xperia Z3 (6.0.1)
 - Sony Xperia Z3 Compact (6.0.1)
 - Sony Xperia Z3 Tablet Compact (6.0.1)
+- Sony Xperia Z4 Tablet LTE (7.1.1)
 - Sony Xperia Z5 (7.1.1)
 - Sony Xperia Z5 Compact (7.1.1)
 - Sony Xperia Z5 Dual (7.1.1)
@@ -618,6 +624,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 - Xiaomi Mi 6 (8.0.0)
 - Xiaomi Mi 8 (8.1.0)
 - Xiaomi Mi A1 (8.0.0)
+- Xiaomi Mi A2 (8.1.0)
 - Xiaomi Mi Max 2 (7.1.1)
 - Xiaomi Mi Mix 2 (8.0.0)
 - Xiaomi Mi Mix 2S (8.0.0)
@@ -635,6 +642,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 - Xiaomi Redmi Note 5/5 Plus (7.1.2)
 - Xiaomi Redmi Note 5 Pro (8.1.0)
 - Xiaomi Redmi Note 5A Lite (7.1.2)
+- Xiaomi Redmi Y1 (7.1.2)
 - ZTE Axon 7 (8.0.0)
 - ZTE Blade (6.0.1)
 - ZTE Nubia Z17 (7.1.1)

common/prints.sh

@@ -3,34 +3,34 @@
 # MagiskHide Props Config
 # By Didgeridoohan @ XDA Developers
 
-PRINTSV=38
+PRINTSV=39
 PRINTSTRANSF=250
 
 # 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
 Asus Zenfone 4 Max (7.1.1)=asus/WW_Phone/ASUS_X00HD_4:7.1.1/NMF26F/14.2016.1801.372-20180119:user/release-keys
 Asus ZenPad S 8.0 (6.0.1)=asus/WW_P01M/P01M_3:6.0.1/MMB29P/WW_P01M-V5.6.0-20170608:user/release-keys
-Essential PH-1 (9)=essential/mata/mata:9/PPR1.181005.076/390:user/release-keys__2018-11-05
+Essential PH-1 (9)=essential/mata/mata:9/PPR1.181005.099/413:user/release-keys__2018-12-05
 Google Nexus 4 (5.1.1)=google/occam/mako:5.1.1/LMY48T/2237560:user/release-keys
 Google Nexus 5 (6.0.1)=google/hammerhead/hammerhead:6.0.1/M4B30Z/3437181:user/release-keys
-Google Nexus 5x (8.1.0)=google/bullhead/bullhead:8.1.0/OPM7.181105.004/5038062:user/release-keys__2018-11-05
+Google Nexus 5X (8.1.0)=google/bullhead/bullhead:8.1.0/OPM7.181205.001/5080180:user/release-keys__2018-12-05
 Google Nexus 6 (7.1.1)=google/shamu/shamu:7.1.1/N6F27M/4299435:user/release-keys
-Google Nexus 6P (8.1.0)=google/angler/angler:8.1.0/OPM7.181105.004/5038062:user/release-keys__2018-11-05
+Google Nexus 6P (8.1.0)=google/angler/angler:8.1.0/OPM7.181205.001/5080180:user/release-keys__2018-12-05
 Google Nexus 7 2012 WiFi (5.1.1)=google/nakasi/grouper:5.1.1/LMY47V/1836172:user/release-keys
 Google Nexus 7 2012 LTE (5.1.1)=google/nakasig/tilapia:5.1.1/LMY47V/1836172:user/release-keys
 Google Nexus 7 2013 WiFi (6.0.1)=google/razor/flo:6.0.1/MOB30X/3036618:user/release-keys
 Google Nexus 7 2013 LTE (6.0.1)=google/razorg/deb:6.0.1/MOB30X/3036618:user/release-keys
 Google Nexus 9 WiFi ()=google/volantis/flounder:7.1.1/N9F27M/4333998:user/release-keys
 Google Nexus 9 LTE (7.1.1)=google/volantisg/flounder_lte:7.1.1/N4F27P/4333386:user/release-keys
 Google Nexus 10 (5.1.1)=google/mantaray/manta:5.1.1/LMY49J/2640980:user/release-keys
-Google Pixel (9)=google/sailfish/sailfish:9/PPR2.181005.003/4984323:user/release-keys__2018-10-05
-Google Pixel XL (9)=google/marlin/marlin:9/PPR2.181005.003/4984323:user/release-keys__2018-10-05
-Google Pixel 2 (9)=google/walleye/walleye:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
-Google Pixel 2 XL (9)=google/taimen/taimen:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
-Google Pixel 3 (9)=google/blueline/blueline:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
-Google Pixel 3 XL (9)=google/crosshatch/crosshatch:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
-Google Pixel C (8.1.0)=google/ryu/dragon:8.1.0/OPM8.181105.002/5038063:user/release-keys__2018-11-05
+Google Pixel (9)=google/sailfish/sailfish:9/PQ1A.181205.002.A1/5129870:user/release-keys__2018-12-05
+Google Pixel XL (9)=google/marlin/marlin:9/PQ1A.181205.002.A1/5129870:user/release-keys__2018-12-05
+Google Pixel 2 (9)=google/walleye/walleye:9/PQ1A.181205.002/5086253:user/release-keys__2018-12-05
+Google Pixel 2 XL (9)=google/taimen/taimen:9/PQ1A.181205.002/5086253:user/release-keys__2018-12-05
+Google Pixel 3 (9)=google/blueline/blueline:9/PQ1A.181205.006/5108886:user/release-keys__2018-12-05
+Google Pixel 3 XL (9)=google/crosshatch/crosshatch:9/PQ1A.181205.006/5108886:user/release-keys__2018-12-05
+Google Pixel C (8.1.0)=google/ryu/dragon:8.1.0/OPM8.181205.001/5080184:user/release-keys__2018-12-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
@@ -105,7 +105,7 @@ Sony Xperia XZ Dual (8.0.0)=Sony/F8332/F8332:8.0.0/41.3.A.2.99/1455830589:user/r
 Sony Xperia XZ Premium (8.0.0)=Sony/G8141/G8141:8.0.0/47.1.A.12.179/1909673090:user/release-keys
 Sony Xperia XZ Premium Dual (8.0.0)=Sony/G8142/G8142:8.0.0/47.1.A.12.179/1909673090:user/release-keys
 Sony Xperia XZ1 (8.0.0)=Sony/G8341/G8341:8.0.0/47.1.A.12.179/1909673090:user/release-keys
-Sony Xperia XZ1 Compact (8.0.0)=Sony/G8441/G8441:8.0.0/47.1.A.12.179/1909673090:user/release-keys
+Sony Xperia XZ1 Compact (9)=Sony/G8441/G8441:9/47.2.A.2.33/3676206253:user/release-keys__2018-11-01
 Sony Xperia XZ1 Dual (8.0.0)=Sony/G8342/G8342:8.0.0/47.1.A.12.179/1909673090:user/release-keys
 Sony Xperia XZ2 (8.0.0)=Sony/H8216/H8216:8.0.0/51.1.A.3.159/620448843:user/release-keys
 Sony Xperia XZ2 Compact (8.0.0)=Sony/H8314/H8314:8.0.0/51.1.A.3.159/620448843:user/release-keys
@@ -117,6 +117,7 @@ Sony Xperia Z2 (6.0.1)=Sony/D6503/D6503:6.0.1/23.5.A.1.291/2769308465:user/relea
 Sony Xperia Z3 (6.0.1)=Sony/D6633/D6633:6.0.1/23.5.A.1.291/2769308465:user/release-keys
 Sony Xperia Z3 Compact (6.0.1)=Sony/D5803/D5803:6.0.1/23.5.A.1.291/2769308465:user/release-keys
 Sony Xperia Z3 Tablet Compact (6.0.1)=Sony/SGP621/SGP621:6.0.1/23.5.A.1.291/3706784398:user/release-keys
+Sony Xperia Z4 Tablet LTE (7.1.1)=Sony/SGP771/SGP771:7.1.1/32.4.A.1.54/219395100:user/release-keys
 Sony Xperia Z5 (7.1.1)=Sony/E6603/E6603:7.1.1/32.4.A.1.54/3761073091:user/release-keys
 Sony Xperia Z5 Compact (7.1.1)=Sony/E5823/E5823:7.1.1/32.4.A.1.54/3761073091:user/release-keys
 Sony Xperia Z5 Dual (7.1.1)=Sony/E6633/E6633:7.1.1/32.4.A.1.54/3761073091:user/release-keys
@@ -131,6 +132,7 @@ Xiaomi Mi 5S Plus (7.0)=Xiaomi/natrium/natrium:7.0/NRD90M/V9.6.2.0.NBGMIFD:user/
 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)=Xiaomi/dipper/dipper:8.1.0/OPM1.171019.011/V9.5.5.0.OEAMIFA:user/release-keys
 Xiaomi Mi A1 (8.0.0)=xiaomi/tissot/tissot_sprout:8.0.0/OPR1.170623.026/V.9.5.10.0.ODHMIFA:user/release-keys
+Xiaomi Mi A2 (8.1.0)=xiaomi/jasmine/jasmine_sprout:8.1.0/OPM1.171019.011/V9.6.16.0.ODIMIFE:user/release-keys__2018-11-05
 Xiaomi Mi Max 2 (7.1.1)=Xiaomi/oxygen/oxygen:7.1.1/NMF26F/V9.5.4.0.NDDMIFA:user/release-keys
 Xiaomi Mi Mix 2 (8.0.0)=Xiaomi/chiron/chiron:8.0.0/OPR1.170623.027/V9.6.1.0.ODEMIFD:user/release-keys
 Xiaomi Mi Mix 2S (9.0.0)=Xiaomi/polaris/polaris:9/PKQ1.180729.001/V10.0.6.0.PDGMIFH:user/release-keys__2018-10-01
@@ -148,6 +150,7 @@ Xiaomi Redmi Note 4/4X (7.0)=xiaomi/mido/mido:7.0/NRD90M/V9.2.1.0.NCFMIEK:user/r
 Xiaomi Redmi Note 5/5 Plus (7.1.2)=xiaomi/vince/vince:7.1.2/N2G47H/V9.5.4.0.NEGMIFA:user/release-keys
 Xiaomi Redmi Note 5 Pro (8.1.0)=xiaomi/whyred/whyred:8.1.0/OPM1.171019.011/V9.5.11.0.OEIMIFA:user/release-keys
 Xiaomi Redmi Note 5A Lite (7.1.2)=xiaomi/ugglite/ugglite:7.1.2/N2G47H/V9.1.2.0.NDFMIEI:user/release-keys
+Xiaomi Redmi Y1 (7.1.2)=xiaomi/ugg/ugg:7.1.2/N2G47H/V9.6.2.0.NDKMIFD:user/release-keys__2018-07-01
 ZTE Axon 7 (8.0.0)=ZTE/P996A01_O/ailsa_ii:8.0.0/OPR1.170623.032/20180815.171922:user/release-keys__2018-07-01
 ZTE Blade (6.0.1)=ZTE/P809A50_MY_MAX/P809A50:6.0.1/MMB29M/20161017.095504:user/release-keys
 ZTE Nubia Z17 (7.1.1)=nubia/NX563J/NX563J:7.1.1/NMF26X/eng.nubia.20171019.101529:user/release-keys

common/util_functions.sh

@@ -176,6 +176,12 @@ get_device_used() {
 	if [ "$PRINTTMP" ]; then
 		echo "${C}$(get_eq_left "$PRINTTMP" | sed "s| (.*||")${N}"
 		echo ""
+	elif [ -s "$CSTMPRINTS" ]; then
+		PRINTTMP=$(cat $CSTMPRINTS | grep "$1")
+		if [ "$PRINTTMP" ]; then
+			echo "${C}$(get_eq_left "$PRINTTMP" | sed "s| (.*||")${N} (from custom list)"
+			echo ""
+		fi
 	fi
 }
 
@@ -206,6 +212,17 @@ replace_fn() {
 	sed -i "s|${1}=${2}|${1}=${3}|" $4
 }
 
+# Format user files
+format_file() {
+	log_handler "Formating file (${1})."
+	# Remove Windows line endings
+	sed -i 's/\r$//' $1
+	# Check for newline at EOF
+	if [ ! -z "$(tail -c 1 "$1")" ]; then
+		echo "" >> $1
+	fi
+}
+
 # Updates placeholders
 placeholder_update() {
 	FILEVALUE=$(get_file_value $1 "$2=")
@@ -374,8 +391,9 @@ orig_safe() {
 # Checks for configuration file
 config_file() {
 	log_handler "Checking for configuration file."
-	if [ -f "$CONFFILE" ]; then
+	if [ -s "$CONFFILE" ]; then
 		log_handler "Configuration file detected (${CONFFILE})."
+		format_file $CONFFILE
 		# Loads custom variables
 		. $CONFFILE
 		# Updates prop values (including fingerprint)	

module.prop

@@ -1,7 +1,7 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v2.7.0-v38
-versionCode=34
+version=v2.7.1-v39
+versionCode=35
 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

@@ -333,8 +333,9 @@ menu_pick_print() {
 			OEMLIST="$(ls $PRINTFILES | sed 's|\.sh||g')"
 			if [ "$OEMLIST" ]; then
 				# Check for custom fingerprints list
-				if [ -f "$CSTMPRINTS" ] && [ ! -f "$CSTMFILE" ]; then
+				if [ -s "$CSTMPRINTS" ] && [ ! -f "$CSTMFILE" ]; then
 					log_handler "Found custom fingerprints list."
+					format_file $CSTMPRINTS
 					log_handler "Creating custom prints file."
 					cat $CSTMPRINTS >> $LOGFILE 2>&1 && echo "" >> $LOGFILE 2>&1
 					echo -e "PRINTSLIST=\"" >> $CSTMFILE
@@ -375,7 +376,7 @@ menu_pick_print() {
 				break
 			fi
 		fi
-		if [ "$INPUT3" -ge 1 ] && [ "$INPUT3" -le "$ITEMCOUNT" ]; then
+		if [ "$INPUT3" -ge 1 ] && [ "$INPUT3" -lt "$ITEMCOUNT" ]; then
 			ITEMCOUNT=1
 			for ITEM in $OEMLIST; do
 				if [ "$ITEMCOUNT" == "$INPUT3" ]; then
@@ -441,7 +442,7 @@ menu_pick_print_sub() {
 			echo -n "Enter '${G}e${N}' to exit: "
 			read -r INPUT4
 		fi
-		if [ "$INPUT4" -ge 1 ] && [ "$INPUT4" -le "$ITEMCOUNT" ]; then
+		if [ "$INPUT4" -ge 1 ] && [ "$INPUT4" -lt "$ITEMCOUNT" ]; then
 			ITEMCOUNT=1
 			SAVEIFS=$IFS
 			IFS=$(echo -en "\n\b")