v3.5.0-v49

META-INF/com/google/android/update-binary

@@ -141,7 +141,7 @@ $POSTFSDATA && cp -af $INSTALLER/common/post-fs-data.sh $MODPATH/post-fs-data.sh
 # service mode scripts
 $LATESTARTSERVICE && cp -af $INSTALLER/common/service.sh $MODPATH/service.sh
 
-# Module script placement
+# Module script installation
 script_install
 
 ui_print "- Setting permissions"

common/post-fs-data.sh

@@ -1,15 +1,11 @@
 #!/system/bin/sh
-# Please don't hardcode /magisk/modname/... ; instead, please use $MODPATH/...
-# This will make your scripts compatible even if Magisk change its mount point in the future
-MODPATH=${0%/*}
-
-# This script will be executed in post-fs-data mode
-# More info in the main Magisk thread
 
 # MagiskHide Props Config
 # Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers
 # Licence: MIT
 
+MODPATH=${0%/*}
+
 # Load functions
 . $MODPATH/util_functions.sh
 
@@ -88,7 +84,22 @@ done
 log_handler "Default values saved to $LATEFILE."
 
 # Check if default file values are safe
-orig_safe
+replace_fn FILESAFE 0 1 $LATEFILE
+for V in $PROPSLIST; do
+	FILEVALUE=$(resetprop $V)
+	log_handler "Checking ${V}=${FILEVALUE}"
+	safe_props $V $FILEVALUE
+	if [ "$SAFE" == 0 ]; then
+		log_handler "Prop $V set to triggering value in prop file."
+		replace_fn FILESAFE 1 0 $LATEFILE
+	else
+		if [ -z "$FILEVALUE" ]; then
+			log_handler "Could not retrieve value for prop $V."
+		elif [ "$SAFE" == 1 ]; then
+			log_handler "Prop $V set to \"safe\" value in prop file."
+		fi
+	fi
+done
 # Loading the new values
 . $LATEFILE
 
@@ -98,18 +109,30 @@ config_file
 # Edits prop values if set for post-fs-data
 echo -e "\n--------------------" >> $LOGFILE 2>&1
 log_handler "Editing prop values in post-fs-data mode."
-if [ "$OPTIONLATE" == 0 ]; then
+if [ "$OPTIONBOOT" == 1 ]; then
 	# ---Setting/Changing fingerprint---
-	print_edit
+	if [ "$PRINTSTAGE" == 0 ]; then
+		print_edit
+	fi
 	# ---Setting device simulation props---
-	dev_sim_edit
+	if [ "$SIMSTAGE" == 0 ]; then
+		dev_sim_edit
+	fi
 	# ---Setting custom props---
 	custom_edit "CUSTOMPROPS"
 fi
-# Deleting props
-prop_del
+# Edit fingerprint if set for post-fs-data
+if [ "$OPTIONBOOT" != 1 ] && [ "$PRINTSTAGE" == 1 ]; then
+	print_edit
+fi
+# Edit simulation props if set for post-fs-data
+if [ "$OPTIONBOOT" != 1 ] && [ "$SIMSTAGE" == 1 ]; then
+	dev_sim_edit
+fi
 # Edit custom props set for post-fs-data
 custom_edit "CUSTOMPROPSPOST"
+# Deleting props
+prop_del
 echo -e "\n--------------------" >> $LOGFILE 2>&1
 
 # Edits build.prop

common/prints.sh

@@ -4,14 +4,15 @@
 # Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers
 # Licence: MIT
 
-PRINTSV=48
-PRINTSTRANSF=260
+PRINTSV=49
+PRINTSTRANSF=350
 
 # 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 Zenfone Max Pro M1 (8.1.0)=asus/RU_X00TD/ASUS_X00T_6:8.1.0/OPM1/15.2016.1902.340-20190216:user/release-keys__2019-02-01 
 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.024/462:user/release-keys__2019-03-05
@@ -27,18 +28,19 @@ Google Nexus 7 2013 LTE (6.0.1)=google/razorg/deb:6.0.1/MOB30X/3036618:user/rele
 Google Nexus 9 WiFi (7.1.1)=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/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
-Google Pixel XL (9)=google/marlin/marlin:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
-Google Pixel 2 (9)=google/walleye/walleye:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
-Google Pixel 2 XL (9)=google/taimen/taimen:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
+Google Pixel (8.1.0 & 9)=google/sailfish/sailfish:8.1.0/OPM2.171019.029/4657601:user/release-keys;google/sailfish/sailfish:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
+Google Pixel XL (8.1.0 & 9)=google/marlin/marlin:8.1.0/OPM2.171019.029/4657601:user/release-keys;google/marlin/marlin:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
+Google Pixel 2 (8.1.0 & 9)=google/walleye/walleye:8.1.0/OPM2.171019.029/4657601:user/release-keys;google/walleye/walleye:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
+Google Pixel 2 XL (8.1.0 & 9)=google/taimen/taimen:8.1.0/OPM4.171019.016.B1/4720843:user/release-keys;google/taimen/taimen:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
 Google Pixel 3 (9)=google/blueline/blueline:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
 Google Pixel 3 XL (9)=google/crosshatch/crosshatch:9/PQ2A.190305.002/5240760:user/release-keys__2019-03-05
 Google Pixel C (8.1.0)=google/ryu/dragon:8.1.0/OPM8.190305.001/5238107:user/release-keys__2019-03-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 Honor 8X (8.1.0)=HONOR/JSN-L21RU/HWJSN-H:8.1.0/HONORJSN-L21/101(C10):user/release-keys__2018-10-01
+Huawei Honor 9 (8.0.0 & 9)=HONOR/STF-L09/HWSTF:8.0.0/HUAWEISTF-L09/364(C432):user/release-keys;HONOR/STF-L09/HWSTF:9/HUAWEISTF-L09/157C432R1:user/release-keys__2019-02-01
 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 Mate 20 Pro (9)=HUAWEI/LYA-L29/HWLYA:9/HUAWEILYA-L29/183AUSC636R1:user/release-keys
@@ -47,7 +49,7 @@ Huawei P9 (7.0)=HUAWEI/EVA-L09/HWEVA:7.0/HUAWEIEVA-L09/C432B502:user/release-key
 Huawei P9 Lite (7.0)=HUAWEI/VNS-L31/HWVNS-H:7.0/HUAWEIVNS-L31/C432B414:user/release-keys__2018-06-01
 Huawei P9 Plus (7.0)=HUAWEI/VIE-L09/HWVIE:7.0/HUAWEIVIE-L09/C432B387:user/release-keys__2018-07-01
 Huawei P20 (9)=HUAWEI/EML-L29/HWEML:9/HUAWEIEML-L29/197C432R1:user/release-keys__2019-01-01
-Huawei P20 Pro (8.1.0)=HUAWEI/CLT-L29/HWCLT:8.1.0/HUAWEICLT-L29/128(C432):user/release-keys
+Huawei P20 Pro (8.1.0 & 9)=HUAWEI/CLT-L29/HWCLT:8.1.0/HUAWEICLT-L29/128(C432):user/release-keys;HUAWEI/CLT-L09/HWCLT:9/HUAWEICLT-L09/203C432R1:user/release-keys__2019-02-01
 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
 LG G4 H812 (6.0)=lge/p1_rgs_ca/p1:6.0/MRA58K/1601215569825:user/release-keys
@@ -62,7 +64,7 @@ Motorola Moto E5 Plus (8.0.0)=motorola/hannah_sprint/hannah:8.0.0/OCPS27.91-32-4
 Motorola Moto G4 (7.0)=motorola/athene/athene:7.0/NPJS25.93-14-13/3:user/release-keys
 Motorola Moto G5 (7.0)=motorola/cedric/cedric:7.0/NPPS25.137-15-11/11:user/release-keys
 Motorola Moto G5 Plus (7.0)=motorola/potter_n/potter_n:7.0/NPNS25.137-33-11/11:user/release-keys
-Motorola Moto G5S (7.1.1)=motorola/montana/montana:7.1.1/NPPS26.102-49-8/6:user/release-keys
+Motorola Moto G5S (7.1.1 & 8.1.0)=motorola/montana/montana:7.1.1/NPPS26.102-49-8/6:user/release-keys
 Motorola Moto G6 Play (8.0.0)=motorola/jeter_sprint/jeter:8.0.0/OCP27.91-23/23:user/release-keys
 Motorola Moto X4 (8.0.0)=motorola/payton/payton:8.0.0/OPWS27.57-25-6-10/12:user/release-keys
 Motorola Moto Z2 Play (8.0.0)=motorola/albus/albus:8.0.0/OPS27.76-12-25/26:user/release-keys
@@ -74,9 +76,9 @@ 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 (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/1902221914:user/release-keys__2019-01-01
-OnePlus 6 (9)=OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1809150000:user/release-keys__2018-09-05
+OnePlus 5 (8.1.0 & 9)=OnePlus/OnePlus5/OnePlus5:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5/OnePlus5:9/PKQ1.180716.001/1812102249:user/release-keys__2018-12-01
+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/1902221914:user/release-keys__2019-01-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
 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
@@ -118,7 +120,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 (9)=Sony/G8441/G8441:9/47.2.A.2.33/3676206253:user/release-keys__2018-11-01
+Sony Xperia XZ1 Compact (8.0.0 & 9)=Sony/G8441/G8441:8.0.0/47.1.A.12.179/1909673090:user/release-keys;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
@@ -139,19 +141,19 @@ Sony Xperia Z5 Premium Dual (7.1.1)=Sony/E6883/E6883:7.1.1/32.4.A.1.54/376107309
 Vodafone Smart Ultra 6 (5.1.1)=Vodafone/P839V55/P839V55:5.1.1/LMY47V/20161227.134319.15534:user/release-keys
 Xiaomi Mi 3/4 (6.0.1)=Xiaomi/cancro/cancro:6.0.1/MMB29M/V9.5.2.0.MXDMIFA:user/release-keys
 Xiaomi Mi 4C (7.0)=Xiaomi/libra/libra:7.0/NRD90M/V9.6.2.0.NXKCNFD:user/release-keys
-Xiaomi Mi 5/5 Pro (8.0.0)=Xiaomi/gemini/gemini:8.0.0/OPR1.170623.032/V9.6.1.0.OAAMIFD:user/release-keys
+Xiaomi Mi 5/5 Pro (7.0 & 8.0.0)=Xiaomi/gemini/gemini:7.0/NRD90M/V9.2.1.0.NAAMIEK:user/release-keys;Xiaomi/gemini/gemini:8.0.0/OPR1.170623.032/V9.6.1.0.OAAMIFD:user/release-keys
 Xiaomi Mi 5S (7.0)=Xiaomi/capricorn/capricorn:7.0/NRD90M/V9.5.4.0.NAGMIFD:user/release-keys
-Xiaomi Mi 5S Plus (7.0)=Xiaomi/natrium/natrium:7.0/NRD90M/V9.6.2.0.NBGMIFD:user/release-keys
+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 (9)=Xiaomi/dipper/dipper:9/PKQ1.180729.001/V10.1.2.0.PEAMIFI:user/release-keys__2018-11-01
-Xiaomi Mi A1 (9)=xiaomi/tissot/tissot_sprout:9/PKQ1.180917.001/V10.0.4.0.PDHMIXM:user/release-keys_2019-01-05
-Xiaomi Mi A2 (9)=xiaomi/jasmine/jasmine_sprout:9/PKQ1.180904.001/V10.0.4.0.PDIMIXM:user/release-keys__2019-02-05
+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 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.4.0.PDIMIXM:user/release-keys__2019-02-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
 Xiaomi Mi Max (6.0.1)=Xiaomi/helium/helium:6.0.1/MMB29M/V8.2.3.0.MBDMIDL:user/release-keys
 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/V10.2.2.0.ODEMIXM:user/release-keys__2018-12-01
-Xiaomi Mi Mix 2S (9)=Xiaomi/polaris/polaris:9/PKQ1.180729.001/V10.2.1.0.PDGMIXM:user/release-keys__2018-11-01
-Xiaomi Mi Note 2 (8.0.0)=Xiaomi/scorpio/scorpio:8.0.0/OPR1.170623.032/V9.6.1.0.OADCNFD:user/release-keys
+Xiaomi Mi Mix 2S (8.0.0 & 9)=Xiaomi/polaris/polaris:8.0.0/OPR1.170623.032/V9.5.19.0.ODGMIFA:user/release-keys;Xiaomi/polaris/polaris:9/PKQ1.180729.001/V10.2.2.0.PDGMIXM:user/release-keys__2019-02-01
+Xiaomi Mi Note 2 (7.0 & 8.0.0)=Xiaomi/scorpio/scorpio:7.0/NRD90M/V9.2.1.0.NADMIEK:user/release-keys;Xiaomi/scorpio/scorpio:8.0.0/OPR1.170623.032/V9.6.1.0.OADCNFD:user/release-keys
 Xiaomi Mi Pad 4 (8.1.0)=Xiaomi/clover/clover:8.1.0/OPM1.171019.019/V10.1.1.0.ODJCNFI:user/release-keys__2018-10-01
 Xiaomi Pocophone F1 (9)=Xiaomi/beryllium/beryllium:9/PKQ1.180729.001/V10.2.3.0.PEJMIXM:user/release-keys__2019-02-05
 Xiaomi Redmi 3/3 Pro (5.1.1)=Xiaomi/ido/ido:5.1.1/LMY47V/V9.6.2.0.LAIMIFD:user/release-keys
@@ -168,7 +170,7 @@ Xiaomi Redmi Note 5 Pro (8.1.0)=xiaomi/whyred/whyred:8.1.0/OPM1.171019.011/V10.0
 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 Note 6 Pro (8.1.0)=xiaomi/tulip/tulip:8.1.0/OPM1.171019.011/V10.0.5.0.OEKMIFH:user/release-keys__2018-10-01
 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 Axon 7 (7.1.1 & 8.0.0)=ZTE/P996A01_N/ailsa_ii:7.1.1/NMF26V/20171211.005949:user/release-keys;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
 Zuk Z2 Pro (7.0)=ZUK/z2_row/z2_row:7.0/NRD90M/2.5.435_170525:user/release-keys

common/propsconf_conf

@@ -4,12 +4,13 @@
 # Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers
 # Licence: MIT
 
-# Required module version
-CONFTRANSF=300
+# Required module version. Do not edit this value!
+CONFTRANSF=350
 
 # Device fingerprint
 CONFFINGERPRINT=""
 CONFVENDPRINT=false
+CONFPRINTBOOT=default
 
 # Device simulation
 CONFDEVSIM=false
@@ -20,6 +21,8 @@ CONFRELEASE=true
 CONFID=true
 CONFINCREMENTAL=true
 CONFDESCRIPTION=true
+CONFSDK=true
+CONFSIMBOOT=default
 
 # Edit prop files
 CONFPROPFILES=false
@@ -42,9 +45,10 @@ CONFDELPROPS=""
 DELPROPOPTION=replace
 
 # Module settings
-CONFLATE=false
+CONFBOOT=default
 CONFCOLOUR=true
 CONFWEB=true
+CONFUPDATE=true
 
 # =================================================================
 # ========================== Instructions =========================
@@ -82,15 +86,25 @@ CONFWEB=true
 # fingerprint for Treble GSI ROMs (so only us this if you're on a Treble GSI ROM).
 # NOTE! Keep in mind that there is no need to enter a fingerprint in
 # CONFFINGERPRINT when enabling this option, or setting a security patch date.
+#
+# CONFPRINTBOOT is by default set to using the module default boot stage for setting props.
+# If the setting is changed to "post" or "late", the props will be set during either
+# post-fs-data or late_start service mode. This is useful if props don't seem to set
+# propely or the module's boot script seems to be causing issues during boot.
 
 # CONFDEVSIM and the following CONFBRAND, CONFNAME, CONFDEVICE, CONFRELEASE
-# CONFID, CONFINCREMENTAL and CONFDESCRIPTION are used to set a number
+# CONFID, CONFINCREMENTAL, CONFDESCRIPTION and CONFSDK are used to set a number
 # of props to simulate a certain deviced based on the fingerprint used.
 # CONFDESCRIPTION will automatically be applied if a fingerprint is set
 # by the module, but the other props will only be set if CONFDEVSIM is
 # set to true, and the default setting for all props are that they will be
 # set by the module. If you want to change this, change "true" to "false"
 # for the applicable variables.
+#
+# CONFSIMBOOT is by default set to using the module default boot stage for setting props.
+# If the setting is changed to "post" or "late", the props will be set during either
+# post-fs-data or late_start service mode. This is useful if props don't seem to set
+# propely or the module's boot script seems to be causing issues during boot.
 
 # CONFPROPFILES should be set to "true" if you want to mask the file
 # values in build.prop and default.prop. For better root hiding.
@@ -140,10 +154,10 @@ CONFWEB=true
 # This option supersedes the preserve option described above, but only
 # for the CONFDELPROPS variable.
 
-# CONFLATE is by default set to "false". This loads the boot script during the
-# post-fs-data mode. If the setting is changed to "true", the boot script
-# will instead be loaded later during boot, in the late_start service mode. This is
-# useful if the module's boot script seems to be causing issues during boot.
+# CONFBOOT is by default set to using the module system.prop file for most props.
+# If the setting is changed to "post" or "late", the props will be set during either
+# post-fs-data or  late_start service mode. This is useful if props don't seem to set
+# propely or the module's boot script seems to be causing issues during boot.
 #
-# CONFCOLOUR and CONFWEB are the options for colour and automatic fingerprints
-# list update. See the module documentation for more details. Set to "true" or "false".
+# CONFCOLOUR, CONFWEB and CONFUPDATE are the options for scrit colours, automatic fingerprints
+# list update and automatic update of the set fingerprint. See the module documentation for more details. Set to "true" or "false".

common/propsconf_late

@@ -10,45 +10,61 @@
 # In that case, feel free to delete it.
 
 # Script version
-SCRIPTV=23
+SCRIPTV=24
 SETTRANSF=2
-NOTTRANSF="OPTIONLATE"
+NOTTRANSF=""
 
-# Variables
-COREPATH=CORE_PLACEHOLDER
+# Paths
+COREPATHPH=CORE_PLACEHOLDER
 IMGPATH=$COREPATH/img
 MODPATH=$IMGPATH/MagiskHidePropsConf
-CACHELOC=CACHE_PLACEHOLDER
+CACHELOCPH=CACHE_PLACEHOLDER
 LATELOGFILE=$CACHELOC/propsconf_latefile.log
 
+# Fingerprint
 FINGERPRINTENB=1
 PRINTMODULE=0
 PRINTEDIT=0
 PRINTVEND=0
+PRINTCHK=0
+
+# Simulation
 DEVSIM=0
+
+# Prop files
 BUILDPROPENB=1
 FILESAFE=1
 BUILDEDIT=0
 DEFAULTEDIT=0
+
+# Custom props
 PROPCOUNT=0
 PROPEDIT=0
 CUSTOMEDIT=0
 DELEDIT=0
-REBOOTCHK=0
-PRINTCHK=0
-OPTIONLATE=0
+
+# Boot stages
+PRINTSTAGE=0
+SIMSTAGE=0
+
+# Script settings
+OPTIONBOOT=0
 OPTIONCOLOUR=1
 OPTIONWEB=1
 OPTIONUPDATE=1
 
+# Device simulation
 BRANDSET=1
 NAMESET=1
 DEVICESET=1
 RELEASESET=1
 IDSET=1
 INCREMENTALSET=1
 DESCRIPTIONSET=1
+SDKSET=1
 
+# Misc
+REBOOTCHK=0
 CACHEFILES="
 propsconf_conf
 reset_mhpc
@@ -72,6 +88,7 @@ ORIGRELEASE=""
 ORIGID=""
 ORIGINCREMENTAL=""
 ORIGDESCRIPTION=""
+ORIGSDK=""
 
 # ---Module values---
 MODULEDEBUGGABLE=""
@@ -89,6 +106,7 @@ SIMRELEASE=""
 SIMID=""
 SIMINCREMENTAL=""
 SIMDESCRIPTION=""
+SIMSDK=""
 
 # ---Custom prop values---
 CUSTOMPROPS=""
@@ -124,12 +142,12 @@ cleanup() {
 	for ITEM in $CACHEFILES; do
 		if [ -f "$CACHELOC/$ITEM" ]; then
 			echo "Deleting ${ITEM}." >> $LATELOGFILE 2>&1
-			rm -f $CACHELOC/$ITEM >> $LATELOGFILE 2>&1
+			rm -f $CACHELOC/$ITEM
 		fi
 	done
 	# Suicide.
 	echo "Removing script." >> $LATELOGFILE 2>&1
-	rm -f $0 >> $LATELOGFILE 2>&1
+	rm -f $0
 }
 
 # Checks if the module is installed. Deletes itself if it isn't.