v3.0.3-v44

Magisk-Modules-Repo · Feb 10, 2019 · c5d5e06 · c5d5e06
1 parent b85239a
commit c5d5e06
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -112,7 +112,7 @@ google/shamu/shamu:7.1.1/N8I11B/4171878:user/release-keys
 ```
 
 #### The getprop method
-If you don't want to use one of the provided fingerprints, you can get one for your device by running the getprop command below on a stock ROM/firmware/factory image that fully passes SafetyNet.
+You can get a certified fingerprint for your device by running the getprop command below on a stock ROM/firmware/factory image that fully passes SafetyNet.
 ```
 getprop ro.build.fingerprint
 ```
@@ -133,7 +133,6 @@ Once you have the file downloaded, there are several different ways that the fin
 - Sometimes there'll be a build.prop file directly in the zip/package. You might find the fingerprint in there.
 - For some devices you'll have to unpack the system.img to get to the build.prop or default.prop file, where you might find the info you want.This can sometimes be done with a simple archive app/program, but sometimes more advanced utilities are needed. On Windows, you can use something like [this tool](https://forum.xda-developers.com/showpost.php?p=57742855&postcount=42). You'll also find more info in the [main thread for that post](https://forum.xda-developers.com/android/software-hacking/how-to-conver-lollipop-dat-files-to-t2978952).
 - Other times you'll find the fingerprint in META-INF\com\google\android\updater-script. Look for "Target:" and you'll likely find the fingerprint there.
-
 - Etc... Experiment, the fingerprint will be in there somewhere. 
 
 #### The firmware.mobi method
@@ -177,7 +176,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 - v43_**
+**_Current fingerprints list version - v44_**
 
 
 ## Please add support for device X
@@ -358,6 +357,10 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 
 
 ## Changelog
+### v3.0.3  
+- Small update to the query for activating device simulation or not when picking a new fingerprint.
+- Updated the fingerprints list and added Asus Zenfone Max M1 and the Elephone U Pro to the list, and updated the OnePlus 5. List updated to v44.
+
 ### v3.0.2  
 - Another quickfix, this time fixing editing already set custom props (a victim of slightly too heavy-handed optimisations of variable and settings retrieval in v3.0.0).
 
@@ -574,10 +577,12 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 
 
 ## Current fingerprints list
-### List v43  
+### List v44  
 - Asus Zenfone 2 Laser (6.0.1)
 - Asus Zenfone 4 Max (7.1.1)
+- Asus Zenfone Max M1 (8.0.0)
 - Asus ZenPad S 8.0 (6.0.1)
+- Elephone U Pro (8.0.0)
 - Essential PH-1 (9)
 - Google Nexus 4 (5.1.1)
 - Google Nexus 5 (6.0.1)

diff --git a/common/prints.sh b/common/prints.sh
@@ -4,14 +4,16 @@
 # Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers
 # Licence: MIT
 
-PRINTSV=43
+PRINTSV=44
 PRINTSTRANSF=260
 
 # 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 Zenfone Max M1 (8.0.0)=asus/WW_X00PD/ASUS_X00P_4:8.0.0/OPR1.170623.032/15.00.1811.91:user/release-keys__2018-11-05
 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
+Elephone U Pro (8.0.0)=Elephone/U_Pro/U_Pro:8.0.0/Elephone_U_Pro_20180917/09172123:user/release-keys__2018-09-05
 Essential PH-1 (9)=essential/mata/mata:9/PQ1A.190105.014/451:user/release-keys__2019-02-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
@@ -72,7 +74,7 @@ OnePlus 2 (6.0.1)=OnePlus/OnePlus2/OnePlus2:6.0.1/MMB29M/1447858500:user/release
 OnePlus X (6.0.1)=OnePlus/OnePlus/OnePlus:6.0.1/MMB29M/10281213:user/release-keys
 OnePlus 3 (8.0.0)=OnePlus/OnePlus3/OnePlus3:8.0.0/OPR1.170623.032/1809142047:user/release-keys__2018-09-01
 OnePlus 3T (8.0.0)=OnePlus/OnePlus3/OnePlus3T:8.0.0/OPR1.170623.032/1812060016:user/release-keys__2018-11-01
-OnePlus 5 (8.1.0)=OnePlus/OnePlus5/OnePlus5:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01
+OnePlus 5 (9)=OnePlus/OnePlus5/OnePlus5:9/PKQ1.180716.001/1812102249:user/release-keys__2018-12-01
 OnePlus 5T (9)=OnePlus/OnePlus5T/OnePlus5T:9/PKQ1.180716.001/1901182129:user/release-keys__2018-12-01
 OnePlus 6 (9)=OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1809150000:user/release-keys__2018-09-05
 OnePlus 6T (9)=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1811170214:user/release-keys__2018-11-01

diff --git a/common/util_functions.sh b/common/util_functions.sh
@@ -249,6 +249,20 @@ format_file() {
 	fi
 }
 
+# Reboot the device
+force_reboot() {
+	echo ""
+	log_print "${C}Rebooting...${N}"
+	setprop sys.powerctl reboot
+	sleep 15
+	log_handler "Rebooting failed."
+	echo ""
+	echo "That doesn't seem like it worked..."
+	echo "Please reboot manually."
+	echo ""
+	exit 0
+}
+
 # Updates placeholders
 placeholder_update() {
 	FILEVALUE=$(get_file_value $1 "$2=")

diff --git a/module.prop b/module.prop
@@ -1,7 +1,7 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v3.0.2-v43
-versionCode=39
+version=v3.0.3-v44
+versionCode=40
 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
diff --git a/system/binpath/props b/system/binpath/props
@@ -139,7 +139,9 @@ invalid_input() {
 		;;
 		4) INPMSG="Only enter '${G}y${N}', '${G}n${N}', '${G}r${N}' or '${G}e${N}'."
 		;;
-		5) INPMSG="Enter a fingerprint or pick from the options, one at a time."
+		5) INPMSG="Only enter '${G}d${N}', '${G}y${N}', '${G}n${N}' or '${G}e${N}'."
+		;;
+		6) INPMSG="Enter a fingerprint or pick from the options, one at a time."
 		;;
 	esac
 
@@ -197,16 +199,7 @@ reboot_fn() {
 		fi
 		case "$INPUT5" in
 			y|Y)
-				echo ""
-				log_print "${C}Rebooting...${N}"
-				setprop sys.powerctl reboot
-				sleep 15
-				log_handler "Rebooting failed."
-				echo ""
-				echo "That doesn't seem like it worked..."
-				echo "Please reboot manually."
-				echo ""
-				exit 0
+				force_reboot
 			;;
 			n|N)
 				if [ "$2" == "p" ] || [ "$2" == "r" ] || [ "$2" == "reset-script" ]; then
@@ -327,7 +320,7 @@ menu_change_fingerprint() {
 				if [ "$ORIGVENDPRINT" ]; then
 					menu_vendor_print "$1"
 				else
-					invalid_input 5 2
+					invalid_input 6 2
 				fi
 			;;
 			u|U)
@@ -347,7 +340,7 @@ menu_change_fingerprint() {
 			;;
 			*)
 				if [ "${#INPUT2}" -lt 10 ]; then
-					invalid_input 5 2
+					invalid_input 6 2
 				else
 					menu_new_print "$1" "$INPUT2" 2
 				fi
@@ -552,21 +545,33 @@ menu_devsim_activate() {
 		if [ -z "$INPUT6" ]; then
 			menu_header "${C}$1${N}"
 			echo ""
-			echo "You have just chosen a new device fingerprint."
-			echo "Would you like to activate device simulation?"
+			echo "The device fingerprint has been updated."
 			echo ""
-			echo -n "Enter ${G}y${N}(es), ${G}n${N}(o) or ${G}e${N}(xit): "
+			echo "Reboot for changes to take effect."
+			echo ""
+			echo "Do you want to reboot now (y/n)?"
+			echo ""
+			echo "You have just chosen a new device"
+			echo "fingerprint. Enter ${G}d${N} to"
+			echo "activate basic device simulation."
+			echo "See the module documentation for"
+			echo "details about this feature."
+			echo ""
+			echo -n "Enter ${G}d${N}, ${G}y${N}(es), ${G}n${N}(o) or ${G}e${N}(xit): "
 			read -r INPUT6
 		fi
 		case "$INPUT6" in
-			y|Y)
+			d|D)
 				INPUT2=""
 				INPUT3=""
 				INPUT4=""
 				INPUT5=""
 				change_dev_sim "Device simulation"
 				break
 			;;
+			y|Y)
+				force_reboot
+			;;
 			n|N)
 				INPUT2=""
 				INPUT3=""
@@ -577,7 +582,7 @@ menu_devsim_activate() {
 			;;
 			e|E) exit_fn
 			;;
-			*)	invalid_input 3 6
+			*)	invalid_input 5 6
 			;;
 		esac
 	done