v2.1.4

Author: Didgeridoohan

README.md

@@ -48,7 +48,18 @@ If you've picked a certified fingerprint from the provided list, or you're using
 - First, do you pass basicIntegrity? If you don't, there's something else going on that this module can't help you with. Take a look under "Miscellaneous MagiskHide issues" below.
 - Try a different fingerprint from the provided list.
 - Make sure you don't have any remnants from previous root methods that may interfere with the SafetyNet check. A clean install of your system may be required.
-- If you can't get things working, make sure to provide logs. See "Logs, etc" below.
+- Some ROMs will just not be able to pass the ctsProfile check, if they contain signs of a rooted/modified device that Magisk can't hide.
+- If you can't get things working, and want help, make sure to provide logs. See "Logs, etc" below.
+
+
+## Keeping your device "certified"
+If you're using a custom ROM, the chances of it being [perceived as uncertified by Google](https://www.xda-developers.com/google-blocks-gapps-uncertified-devices-custom-rom-whitelist/) are pretty high. If your ROM has a build date later than March 16 2018, this might mean that you can't even log into your Google account or use Gapps without [whitelisting your device with Google](https://www.google.com/android/uncertified/) first.
+
+Magisk, and this module, can help with that.
+
+Before setting up your device, install Magisk, this module and use the configuration file described below to pass the ctsProfile check. This should make your device be perceived as certified by Google and you can log into your Google account and use your device without having to whitelist it. Check [here](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/common/prints.sh) for usable fingerprints (only use the part to the right of the equal sign).
+
+If you're having issues getting your device certified, take a look in the Magisk troubleshooting guide linked below.
 
 
 ## Current fingerprints list version
@@ -86,16 +97,6 @@ There are a couple of persistent options that you can set for the `props` script
 You can use a configuration file to set your desired options, rather than running the `props` command. Download the [settings file](https://raw.githubusercontent.com/Magisk-Modules-Repo/MagiskHide-Props-Config/master/common/propsconf_conf) or extract it from the module zip (in the common folder), fill in the desired options (follow the instructions in the file), place it in /cache (or /data/cache if you're using an A/B device) and reboot. This can also be done directly at the first install (through Manager or recovery), before even rebooting your device. Instant settings.
 
 
-## Keeping your device "certified"
-If you're using a custom ROM, the chances of it being [perceived as uncertified by Google](https://www.xda-developers.com/google-blocks-gapps-uncertified-devices-custom-rom-whitelist/) are pretty high. If your ROM has a build date later than March 16 2018, this might mean that you can't even log into your Google account or use Gapps without [whitelisting your device with Google](https://www.google.com/android/uncertified/) first.
-
-Magisk, and this module, can help with that.
-
-Before setting up your device, install Magisk, this module and use the configuration file described above to pass the ctsProfile check. This should make your device be perceived as certified by Google and you can log into your Google account and use your device without having to whitelist it. Check [here](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/common/prints.sh) for usable fingerprints (only use the part to the right of the equal sign).
-
-If you're having issues getting your device certified, take a look in the Magisk troubleshooting guide linked below.
-
-
 ## Miscellaneous MagiskHide issues
 If you're having issues passing SafetyNet, getting your device certified, or otherwise getting MagiskHide to work, take a look in the [Magisk and MagiskHide Installation and Troubleshooting Guide](https://www.didgeridoohan.com/magisk). Lots of good info there (if I may say so myself)...
 
@@ -113,7 +114,9 @@ Place a file named `reset_mhpc` in /cache (or /data/cache on A/B devices) and re
 It is possible to use this in combination with the configuration file described above to keep device fingerprint or any other settings intact past the reset. Just make sure to remove any custom props that might have been causing issues from the configuration file.
 
 ### Logs, etc
-In case of issues, please provide the logs, saved in /cache, "magisk.log", "propsconf.log" and "propsconf_last.log", together with a detailed description of your problem. Providing the output from terminal might also be useful. If you have the latest beta release of Magisk installed, the "magisk_debug.log" is also useful. If there's no new beta released, there's always a beta version of the latest stable Magisk release, so that you can collect the debug log.
+In case of issues, please provide the different log files, found in /cache (or /data/cache for A/B devices), together with a detailed description of your problem. The logs available could include "magisk.log", "propsconf.log", "propsconf_last.log", "propsconf_install.log" and "propsconf_latefile.log" Providing the output from terminal might also be useful.
+
+If you have the latest beta release of Magisk installed, the "magisk_debug.log" is also useful. If there's no new beta released, there's always a beta version of the latest stable Magisk release (the only difference is the more verbose logging), so that you can collect the debug log.
 
 
 ## Source
@@ -126,6 +129,13 @@ In case of issues, please provide the logs, saved in /cache, "magisk.log", "prop
 
 
 ## Changelog
+### v2.1.4  
+- Fixed improved hiding.
+- Fixed using the configuration file on a clean install.
+- Fixed a fault in the AE-35 Unit.
+- Improved logging.
+- A bunch of optimisations that will probably break stuff.
+
 ### v2.1.3  
 - Reverted the function to only editing existing fingerprint props.
 - Optimised setting the different props.

common/post-fs-data.sh

@@ -19,16 +19,8 @@ IMGPATH=$(dirname "$MODPATH")
 rm -f $RUNFILE
 touch $RUNFILE
 
-# Saves the previous log (if available) and creates a new one
-if [ -f "$LOGFILE" ]; then
-	mv -f $LOGFILE $LASTLOGFILE
-fi
-touch $LOGFILE
-echo "***************************************************" >> $LOGFILE
-echo "******** MagiskHide Props Config $MODVERSION ********" >> $LOGFILE
-echo "**************** By Didgeridoohan ***************" >> $LOGFILE
-echo "***************************************************" >> $LOGFILE
-log_script_chk "Log start."
+# Start logging
+log_start
 
 # Check for boot scripts and restore backup if deleted, or if the resetfile is present
 if [ ! -f "$LATEFILE" ] || [ -f "$RESETFILE" ]; then
@@ -56,12 +48,12 @@ replace_fn FILESELINUX "\"$LATEFILESELINUX\"" "\"$FILESELINUX\"" $LATEFILE
 replace_fn FILEFINGERPRINT "\"$LATEFILEFINGERPRINT\"" "\"$FILEFINGERPRINT\"" $LATEFILE
 log_handler "Default values saved to $LATEFILE."
 
-# Checks for configuration file
-config_file
-
 # Check if original file values are safe
 orig_safe
 
+# Checks for configuration file
+config_file
+
 # Edits build.prop
 if [ "$(get_file_value $LATEFILE "FILESAFE=")" == 0 ]; then
 	log_handler "Checking for conflicting build.prop modules."
@@ -90,25 +82,9 @@ if [ "$(get_file_value $LATEFILE "FILESAFE=")" == 0 ]; then
 
 		# Edits the module copy of build.prop
 		module_values
-		log_handler "Editing build.prop."		
-		for ITEM in $PROPSLIST; do
-			PROP=$(get_prop_type $ITEM)
-			MODULEPROP=$(echo "MODULE${PROP}" | tr '[:lower:]' '[:upper:]')
-			FILEPROP=$(echo "FILE${PROP}" | tr '[:lower:]' '[:upper:]')
-			SETPROP=$(echo "SET${PROP}" | tr '[:lower:]' '[:upper:]')
-			if [ "$(eval "echo \$$MODULEPROP")" ]; then
-				SEDVAR="$(eval "echo \$$MODULEPROP")"
-			else
-				for P in $SAFELIST; do
-					if [ "$(get_eq_left $P)" == "$ITEM" ]; then
-						SEDVAR=$(get_eq_right $P)
-					fi
-				done
-			fi
-			if [ "$(get_file_value $LATEFILE "${SETPROP}=")" == "true" ]; then
-				replace_fn $ITEM $(eval "echo \$$FILEPROP") $SEDVAR $MODPATH/system/build.prop && log_handler "${ITEM}=${SEDVAR}"
-			fi
-		done
+		log_handler "Editing build.prop."
+		# ro.build props
+		change_prop_file "build"		
 		# Fingerprint
 		if [ "$MODULEFINGERPRINT" ] && [ "$(get_file_value $LATEFILE "SETFINGERPRINT=")" == "true" ]; then
 			PRINTSTMP="$(cat /system/build.prop | grep "$FILEFINGERPRINT")"

common/propsconf_late

@@ -9,12 +9,22 @@
 # In that case, feel free to delete it.
 
 # Script version
-SCRIPTV=5
+SCRIPTV=6
 SETTRANSF=1
 
 # Variables
 IMGPATH=IMG_PLACEHOLDER
 MODPATH=$IMGPATH/MagiskHidePropsConf
+CACHELOC=CACHE_PLACEHOLDER
+LATELOGFILE=$CACHELOC/propsconf_latefile.log
+
+CACHEFILES="
+propsconf.log
+propsconf_last.log
+propsconf_install.log
+propsconf_conf
+reset_mhpc
+"
 
 FINGERPRINTENB=1
 PRINTEDIT=0
@@ -31,19 +41,23 @@ OPTIONWEB=1
 
 # Function to clean up different files after the module has been uninstalled
 cleanup() {
-	CACHELOC=CACHE_PLACEHOLDER
-	rm -f $CACHELOC/propsconf.log
-	rm -f $CACHELOC/propsconf_last.log
-	rm -f $CACHELOC/propsconf_conf
-	rm -f $CACHELOC/reset_mhpc
+	echo "Cleaning up files in $CACHELOC." >> $LATELOGFILE
+	for ITEM in $CACHEFILES; do
+		if [ -f "$CACHELOC/$ITEM" ]; then
+			echo "Deleting ${ITEM}." >> $LATELOGFILE
+			rm -f $CACHELOC/$ITEM
+		fi
+	done
 	# Suicide.
+	echo "Removing script." >> $LATELOGFILE
 	rm $0
 }
 
 # Checks if the module is installed. Deletes itself if it isn't.
 if [ -d "$MODPATH" ]; then
 	# Checks if the module is set for removal
-	if [ -f "$MODPATH/remove" ]; then		
+	if [ -f "$MODPATH/remove" ]; then
+		echo "Module set for removal." >> $LATELOGFILE
 		# Cleanup
 		cleanup
 	else
@@ -53,6 +67,7 @@ if [ -d "$MODPATH" ]; then
 		log_script_chk "Running boot script."
 
 		if [ -f "$MODPATH/disable" ]; then
+			log_start
 			log_handler "Module disabled."
 		else
 			# Checks for the Universal SafetyNet Fix module and similar modules editing the device fingerprint
@@ -153,30 +168,22 @@ if [ -d "$MODPATH" ]; then
 			if [ "$DEFAULTEDIT" == 1 ] && [ "$FILESAFE" == 0 ]; then
 				log_handler "Editing default.prop."
 				mount -wo remount rootfs /
-				if [ "$MODULEDEBUGGABLE" ]; then
-					SEDDEBUGGABLE="$MODULEDEBUGGABLE"
-				else
-					SEDDEBUGGABLE="0"
-				fi
-				if [ "$SETDEBUGGABLE" == "true" ]; then
-					replace_fn "ro.debuggable" $FILEDEBUGGABLE $SEDDEBUGGABLE /default.prop && log_handler "ro.debuggable=$SEDDEBUGGABLE"
-				fi
-				if [ "$MODULESECURE" ]; then
-					SEDSECURE="$MODULESECURE"
-				else
-					SEDSECURE="1"
-				fi
-				if [ "$SETSECURE" == "true" ]; then
-					replace_fn "ro.secure" $FILESECURE $SEDSECURE /default.prop && log_handler "ro.secure=$SEDSECURE"
-				fi
+				change_prop_file "default"
 				mount -ro remount rootfs /
 			else
 				log_handler "Default.prop editing disabled."
-			fi			
+			fi
+		fi
+		# Check if the late_start service log file exists.
+		if [ -f "$LATELOGFILE" ]; then
+			log_handler "Removing late_start service log ($LATELOGFILE)."
+			rm -f $LATELOGFILE
 		fi
 		log_script_chk "Boot script finished.\n\n=================="
 	fi
 else
+	echo "$MODPATH not found." >> $LATELOGFILE
+	echo "Module no longer installed." >> $LATELOGFILE
 	# Cleanup
 	cleanup
 fi

common/util_functions.sh

@@ -60,6 +60,18 @@ get_file_value() {
 }
 
 # Logs
+# Saves the previous log (if available) and creates a new one
+log_start() {
+	if [ -f "$LOGFILE" ]; then
+		mv -f $LOGFILE $LASTLOGFILE
+	fi
+	touch $LOGFILE
+	echo "***************************************************" >> $LOGFILE
+	echo "******** MagiskHide Props Config $MODVERSION ********" >> $LOGFILE
+	echo "**************** By Didgeridoohan ***************" >> $LOGFILE
+	echo "***************************************************" >> $LOGFILE
+	log_script_chk "Log start."
+}
 log_handler() {
 	echo "" >> $LOGFILE
 	echo -e "$(date +"%m-%d-%Y %H:%M:%S") - $1" >> $LOGFILE
@@ -128,10 +140,10 @@ replace_fn() {
 # Updates placeholders
 placeholder_update() {
 	FILEVALUE=$(get_file_value $1 "$2=")
-	log_handler "Checking for '$3' in '$1'. Current value is '$FILEVALUE'."
+	log_handler "Checking for ${3} in ${1}. Current value is ${FILEVALUE}."
 	case $FILEVALUE in
 		*PLACEHOLDER*)	replace_fn $2 $3 $4 $1
-						log_handler "Placeholder '$3' updated to '$4' in '$1'."
+						log_handler "Placeholder ${3} updated to ${4} in ${1}."
 		;;
 	esac
 }
@@ -414,7 +426,7 @@ download_prints() {
 
 # Reset the module fingerprint change
 reset_print() {
-	log_handler "Resetting device fingerprint."
+	log_handler "Resetting device fingerprint to default system value."
 
 	SUBA=$(get_file_value $LATEFILE "MODULEFINGERPRINT=")
 
@@ -492,6 +504,7 @@ edit_prop_files() {
 		# Checking if the device fingerprint is set by the module
 		if [ "$(get_file_value $LATEFILE "FINGERPRINTENB=")" == 1 ] && [ "$(get_file_value $LATEFILE "PRINTEDIT=")" == 1 ]; then
 			if [ "$(cat /system/build.prop | grep "$FILEFINGERPRINT")" ]; then
+				log_handler "Enabling prop file editing for device fingerprint."
 				replace_fn SETFINGERPRINT "false" "true" $LATEFILE
 			fi
 		fi
@@ -535,6 +548,44 @@ edit_prop_files() {
 	fi
 }
 
+change_prop_file() {
+	case $1 in
+		build)
+			FNLIST="
+			ro.build.type
+			ro.build.tags
+			ro.build.selinux
+			"
+			PROPFILELOC=$MODPATH/system/build.prop
+		;;
+		default)
+			FNLIST="
+			ro.debuggable
+			ro.secure
+			"
+			PROPFILELOC=/default.prop
+		;;
+	esac
+	for ITEM in $FNLIST; do
+		PROP=$(get_prop_type $ITEM)
+		MODULEPROP=$(echo "MODULE${PROP}" | tr '[:lower:]' '[:upper:]')
+		FILEPROP=$(echo "FILE${PROP}" | tr '[:lower:]' '[:upper:]')
+		SETPROP=$(echo "SET${PROP}" | tr '[:lower:]' '[:upper:]')
+		if [ "$(eval "echo \$$MODULEPROP")" ]; then
+			SEDVAR="$(eval "echo \$$MODULEPROP")"
+		else
+			for P in $SAFELIST; do
+				if [ "$(get_eq_left $P)" == "$ITEM" ]; then
+					SEDVAR=$(get_eq_right $P)
+				fi
+			done
+		fi
+		if [ "$(get_file_value $LATEFILE "${SETPROP}=")" == "true" ]; then
+			replace_fn $ITEM $(eval "echo \$$FILEPROP") $SEDVAR $PROPFILELOC && log_handler "${ITEM}=${SEDVAR}"
+		fi
+	done	
+}
+
 # ======================== MagiskHide Props functions ========================
 # Check safe values
 safe_props() {
@@ -578,7 +629,7 @@ reset_prop() {
 	REPROP=$(echo "RE${PROP}" | tr '[:lower:]' '[:upper:]')
 	SUBA=$(get_file_value $LATEFILE "${MODULEPROP}=")
 
-	log_handler "Resetting $1 to default value."
+	log_handler "Resetting $1 to default system value."
 
 	# Saves new module value
 	replace_fn $MODULEPROP "\"$SUBA\"" "\"\"" $LATEFILE