Skip to content

Commit be098de

Browse files
DidgeridoohanDidgeridoohan
authored
v5.2.3-v79
1 parent cb6cb91 commit be098de

File tree

6 files changed

+47
-66
lines changed

6 files changed

+47
-66
lines changed

‎README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Just run the `props` command and the list will be updated automatically. Use the
225225

226226
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)
227227

228-
**_Current fingerprints list version - v78_**
228+
**_Current fingerprints list version - v79_**
229229

230230

231231
## Please add support for device X
@@ -348,7 +348,7 @@ But first: have you tried turning it off and on again? Toggling MagiskHide off a
348348
If you have questions, suggestions or are experiencing some kind of issue, visit the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-t3789228) @ XDA.
349349

350350
### Known issues
351-
- EdXposed sometimes causes Magisk's boot process to fail, resulting in the module boot scripts (mainly service.sh) not running as they should. Until this has been fixed with EdXposed, there are a couple of ways to work around this. Use the [Configuration file](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#configuration-file) to set everything up during installation, or disable EdXposed before setting the module up and enable it again after the module works as you want it. Just make sure to use the default settings for boot stages.
351+
For the moment, nothing special (I think). If you've got issues, take a look at the most common problems listed below.
352352

353353
### props not found
354354
There are two common reasons why you would get an error saying "not found" when running the `props` command in a terminal emulator.
@@ -451,6 +451,11 @@ Releases from v4.0.0 are compatible with Magisk v19+.
451451
Releases from v5.0.0 are recommended for Magisk v19.4+.
452452

453453
## Changelog
454+
### v5.2.3
455+
- Fixed issue with settings transfering between module updates.
456+
- Use resetprop only to set values and retrieve values with getprop. For whatever reason some devices have issues with resetprop and this might make the module work on those.
457+
- Updated fingerprints for OnePlus 6, 6T and 7T Pro NR. Fingerprints list updated to v79.
458+
454459
### v5.2.2
455460
- Another quick fix taking care of a weird copy-pasta error that broke manufacturer and model simulation.
456461

@@ -770,7 +775,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+.
770775

771776

772777
## Current fingerprints list
773-
### List v78
778+
### List v79
774779
- Asus Zenfone 2 Laser ASUS_Z00LD (6.0.1)
775780
- Asus Zenfone 3 Max ASUS_X00DD (7.1.1 & 8.1.0)
776781
- Asus Zenfone 4 Max ASUS_X00HD (7.1.1)

‎common/prints.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers
55
# Licence: MIT
66

7-
PRINTSV=78
7+
PRINTSV=79
88
PRINTSTRANSF=520
99

1010
# Certified fingerprints
@@ -116,8 +116,8 @@ OnePlus 3 (8.0.0 & 9):OnePlus:ONEPLUS A3000=OnePlus/OnePlus3/OnePlus3:8.0.0/OPR1
116116
OnePlus 3T (8.0.0 & 9):OnePlus:ONEPLUS A3003=OnePlus/OnePlus3/OnePlus3T:8.0.0/OPR1.170623.032/1812060016:user/release-keys__2018-11-01;OnePlus/OnePlus3/OnePlus3T:9/PKQ1.181203.001/1911042108:user/release-keys__2019-10-01
117117
OnePlus 5 (8.1.0 & 9):OnePlus:ONEPLUS A5000=OnePlus/OnePlus5/OnePlus5:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5/OnePlus5:9/PKQ1.180716.001/1912311102:user/release-keys__2019-12-01
118118
OnePlus 5T (7.1.1 & 8.0.0 & 8.1.0 & 9):OnePlus:ONEPLUS A5010=OnePlus/OnePlus5T/OnePlus5T:7.1.1/NMF26X/12152312:user/release-keys;OnePlus/OnePlus5T/OnePlus5T:8.0.0/OPR1.170623.032/02040656:user/release-keys;OnePlus/OnePlus5T/OnePlus5T:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5T/OnePlus5T:9/PKQ1.180716.001/1912311102:user/release-keys__2019-12-01
119-
OnePlus 6 (8.1.0 & 9 & 10):OnePlus:ONEPLUS A6003=OnePlus/OnePlus6/OnePlus6:8.1.0/OPM1.171019.011/06140300:user/release-keys;OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1908012000:user/release-keys__2019-08-01;OnePlus/OnePlus6/OnePlus6:10/QKQ1.190716.003/2001151848:user/release-keys__2019-12-01
120-
OnePlus 6T (9 & 10):OnePlus:ONEPLUS A6013=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1909112330:user/release-keys__2019-08-01;OnePlus/OnePlus6T/OnePlus6T:10/QKQ1.190716.003/2001151848:user/release-keys__2019-12-01
119+
OnePlus 6 (8.1.0 & 9 & 10):OnePlus:ONEPLUS A6003=OnePlus/OnePlus6/OnePlus6:8.1.0/OPM1.171019.011/06140300:user/release-keys;OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1908012000:user/release-keys__2019-08-01;OnePlus/OnePlus6/OnePlus6:10/QKQ1.190716.003/2002220019:user/release-keys__2020-02-01
120+
OnePlus 6T (9 & 10):OnePlus:ONEPLUS A6013=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1909112330:user/release-keys__2019-08-01;OnePlus/OnePlus6T/OnePlus6T:10/QKQ1.190716.003/2002220019:user/release-keys__2020-02-01
121121
OnePlus 6T T-Mobile (9):OnePlus:ONEPLUS A6013=OnePlus/OnePlus6TSingle/OnePlus6TSingle:9/PKQ1.180716.001/1810291147:user/release-keys__2018-11-01
122122
OnePlus 7 GM1901 (9 & 10):OnePlus:GM1901=OnePlus/OnePlus7/OnePlus7:9/PKQ1.190110.001/1907280700:user/release-keys__2019-08-01;OnePlus/OnePlus7/OnePlus7:10/QKQ1.190716.003/2002021900:user/release-keys__2020-01-01
123123
OnePlus 7 GM1903 (9 & 10):OnePlus:GM1905=OnePlus/OnePlus7_EEA/OnePlus7:9/PKQ1.190110.001/1907280700:user/release-keys__2019-08-01;OnePlus/OnePlus7_EEA/OnePlus7:10/QKQ1.190716.003/2002021900:user/release-keys__2020-01-01
@@ -134,7 +134,7 @@ OnePlus 7T HD1905 (10):OnePlus:HD1905=OnePlus/OnePlus7T/OnePlus7T:10/QKQ1.190716
134134
OnePlus 7T Pro HD1911 (10):OnePlus:HD1911=OnePlus/OnePlus7TPro/OnePlus7TPro:10/QKQ1.190716.003/2002022020:user/release-keys__2020-01-01
135135
OnePlus 7T Pro HD1913 (10):OnePlus:HD1913=OnePlus/OnePlus7TPro_EEA/OnePlus7TPro:10/QKQ1.190716.003/2002022020:user/release-keys__2020-01-01
136136
OnePlus 7T Pro HD1917 (10):OnePlus:HD1917=OnePlus/OnePlus7TPro/OnePlus7TPro:10/QKQ1.190716.003/2002022020:user/release-keys__2020-01-01
137-
OnePlus 7T Pro NR HD1925 (10):OnePlus:HD1925=OnePlus/OnePlus7TProNR/OnePlus7TProNR:10/QKQ1.190716.003/2002051152:user/release-keys__2019-12-01
137+
OnePlus 7T Pro NR HD1925 (10):OnePlus:HD1925=OnePlus/OnePlus7TProNR/OnePlus7TProNR:10/QKQ1.190716.003/2002150222:user/release-keys__2020-02-01
138138
OPPO Neo 7 A33w (5.1):Oppo:A33w=OPPO/A33w/A33w:5.1/LMY47I/1487829433:user/release-keys
139139
OPPO Neo 7 A1603 (5.1):Oppo:A1603=OPPO/A1603/A1603:5.1/LMY47I/1489407760:user/release-keys
140140
Razer Phone (8.1.0):Razer:Phone=razer/cheryl/cheryl:8.1.0/OPM1.171019.011-RZR-180803/6033:user/release-keys__2018-07-05

‎common/util_functions.sh

Lines changed: 27 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ force_reboot() {
412412
echo ""
413413
echo "${C}Rebooting...${N}"
414414
log_handler "Rebooting."
415-
[ "$(resetprop sys.boot_completed)" == 1 ] && /system/bin/svc power reboot "" >> $LOGFILE 2>&1 || /system/bin/reboot "" >> $LOGFILE 2>&1 || setprop sys.powerctl reboot >> $LOGFILE 2>&1
415+
[ "$(getprop sys.boot_completed)" == 1 ] && /system/bin/svc power reboot "" >> $LOGFILE 2>&1 || /system/bin/reboot "" >> $LOGFILE 2>&1 || setprop sys.powerctl reboot >> $LOGFILE 2>&1
416416
sleep 15
417417
log_handler "Rebooting failed."
418418
echo ""
@@ -486,14 +486,14 @@ orig_check() {
486486
# Load currently set values
487487
curr_values() {
488488
for ITEM in $VALPROPSLIST; do
489-
CURRTMP=$(resetprop -v $ITEM) >> $LOGFILE 2>&1
489+
CURRTMP=$(getprop $ITEM) >> $LOGFILE 2>&1
490490
TMPPROP=$(get_prop_type $ITEM | tr '[:lower:]' '[:upper:]')
491491
eval "CURR${TMPPROP}='$CURRTMP'"
492492
done
493493
if [ -z "$CURRFINGERPRINT" ]; then
494-
CURRFINGERPRINT=$(resetprop -v ro.bootimage.build.fingerprint) >> $LOGFILE 2>&1
494+
CURRFINGERPRINT=$(getprop ro.bootimage.build.fingerprint) >> $LOGFILE 2>&1
495495
if [ -z "$CURRFINGERPRINT" ]; then
496-
CURRFINGERPRINT=$(resetprop -v ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
496+
CURRFINGERPRINT=$(getprop ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
497497
fi
498498
fi
499499
}
@@ -639,7 +639,7 @@ config_file() {
639639
# Check if vendor fingerprint is set
640640
if [ "$CONFVENDPRINT" == "true" ]; then
641641
log_handler "Using vendor fingerprint"
642-
CONFFINGERPRINT=$(resetprop -v ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
642+
CONFFINGERPRINT=$(getprop ro.vendor.build.fingerprint) >> $LOGFILE 2>&1
643643
fi
644644
# Updates prop values (including fingerprint)
645645
PROPSTMPLIST=$PROPSLIST"
@@ -942,6 +942,7 @@ settings_placement() {
942942
if [ "$SOLD" ] && [ "$SOLD" != "$SNEW" ]; then
943943
log_handler "Setting ${ITEM} from ${SNEW} to ${SOLD}."
944944
sed -i "s|${ITEM}=${SNEW}|${ITEM}=${SOLD}|" $UPDATELATEFILE
945+
# Change post-fs-data execution between regular and background
945946
if [ "$ITEM" == "OPTIONBACK" -a "$SNEW" == 1 ]; then
946947
sed -i -e "s|^{|\#anch0}|;s|^\#anch1|{|;s|regular|background|" $MODPATH/post-fs-data.sh
947948
fi
@@ -1054,26 +1055,6 @@ files_check() {
10541055
fi
10551056
}
10561057

1057-
# Update the device simulation variables if a fingerprint is set
1058-
devsim_update() {
1059-
if [ "$MODULEFINGERPRINT" ]; then
1060-
log_handler "Updating device simulation variables."
1061-
print_parts "$MODULEFINGERPRINT" "var"
1062-
for ITEM in $PROPSETTINGSLIST; do
1063-
case $ITEM in
1064-
SIM*)
1065-
SUBA="$(get_file_value $LATEFILE "${ITEM}=")"
1066-
TMPVAR="$(echo $ITEM | sed 's|SIM|VAR|')"
1067-
TMPPROP="$(eval "echo \$$TMPVAR")"
1068-
sed -i "s|${ITEM}=\"${SUBA}\"|${ITEM}=\"${TMPPROP}\"|" $LATEFILE
1069-
;;
1070-
esac
1071-
done
1072-
# Reload module settings
1073-
load_settings
1074-
fi
1075-
}
1076-
10771058
# Load module settings and reapply the MODPATH variable
10781059
load_settings() {
10791060
log_handler "Loading/reloading module settings."
@@ -1097,7 +1078,6 @@ script_install() {
10971078
placeholder_update $MODPATH/system/$BIN/props ADBPATH ADB_PLACEHOLDER "$ADBPATH"
10981079
placeholder_update $MODPATH/system/$BIN/props LATEFILE LATE_PLACEHOLDER "$LATEFILE"
10991080
load_settings
1100-
devsim_update
11011081
print_files
11021082
ui_print ""
11031083
ui_print "- Make sure to have Busybox installed."
@@ -1165,14 +1145,14 @@ print_edit() {
11651145
log_handler "Changing fingerprint."
11661146
if [ "$PRINTVEND" == 1 ]; then
11671147
log_handler "Using vendor fingerprint (for Treble GSI ROMs)."
1168-
PRINTCHNG="$(resetprop ro.vendor.build.fingerprint)"
1148+
PRINTCHNG="$(getprop ro.vendor.build.fingerprint)"
11691149
# Set device simulation variables
11701150
print_parts "$PRINTCHNG"
11711151
else
11721152
PRINTCHNG="$(echo $MODULEFINGERPRINT | sed 's|\_\_.*||')"
11731153
fi
11741154
# Changing props
1175-
if [ "$(resetprop "ro.build.fingerprint")" ]; then
1155+
if [ "$(getprop "ro.build.fingerprint")" ]; then
11761156
log_handler "Changing/writing ro.build.fingerprint."
11771157
if [ "$1" ]; then
11781158
echo "ro.build.fingerprint=${PRINTCHNG}" >> $1
@@ -1456,10 +1436,8 @@ print_parts() {
14561436
DLIM1=2
14571437
DLIM2=1
14581438
fi
1459-
if [ "$2" != "var" ]; then
1460-
SUBA=$(get_file_value $LATEFILE "SIM${TMPPROP}=")
1461-
replace_fn "SIM${TMPPROP}" "\"$SUBA\"" "\"$TMPVALUE\"" $LATEFILE
1462-
fi
1439+
SUBA=$(get_file_value $LATEFILE "SIM${TMPPROP}=")
1440+
replace_fn "SIM${TMPPROP}" "\"$SUBA\"" "\"$TMPVALUE\"" $LATEFILE
14631441
done
14641442

14651443
VARDESCRIPTION=""
@@ -1475,21 +1453,19 @@ print_parts() {
14751453
esac
14761454
done
14771455
fi
1478-
if [ "$2" != "var" ]; then
1479-
replace_fn SIMDESCRIPTION "\"$SIMDESCRIPTION\"" "\"$VARDESCRIPTION\"" $LATEFILE
1480-
replace_fn SIMDISPLAY "\"$SIMDISPLAY\"" "\"$VARDESCRIPTION\"" $LATEFILE
1481-
replace_fn SIMSDK "\"$SIMSDK\"" "\"$VARSDK\"" $LATEFILE
1482-
TMPPARTS=$(get_eq_left "$(grep $1 $PRINTSLOC)" | sed 's|.*)\:||')
1483-
if [ -z "$TMPPARTS" ]; then
1484-
TMPPARTS=$(get_eq_left "$(grep $1 $CSTMPRINTS)" | sed 's|.*)\:||')
1485-
fi
1486-
if [ $(echo $TMPPARTS | grep -o "\:" | wc -l) == 1 ]; then
1487-
replace_fn SIMMANUFACTURER "\"$SIMMANUFACTURER\"" "\"$(echo $TMPPARTS | cut -f 1 -d ':')\"" $LATEFILE
1488-
replace_fn SIMMODEL "\"$SIMMODEL\"" "\"$(echo $TMPPARTS | cut -f 2 -d ':')\"" $LATEFILE
1489-
else
1490-
replace_fn SIMMANUFACTURER "\"$SIMMANUFACTURER\"" "\"\"" $LATEFILE
1491-
replace_fn SIMMODEL "\"$SIMMODEL\"" "\"\"" $LATEFILE
1492-
fi
1456+
replace_fn SIMDESCRIPTION "\"$SIMDESCRIPTION\"" "\"$VARDESCRIPTION\"" $LATEFILE
1457+
replace_fn SIMDISPLAY "\"$SIMDISPLAY\"" "\"$VARDESCRIPTION\"" $LATEFILE
1458+
replace_fn SIMSDK "\"$SIMSDK\"" "\"$VARSDK\"" $LATEFILE
1459+
TMPPARTS=$(get_eq_left "$(grep $1 $PRINTSLOC)" | sed 's|.*)\:||')
1460+
if [ -z "$TMPPARTS" ]; then
1461+
TMPPARTS=$(get_eq_left "$(grep $1 $CSTMPRINTS)" | sed 's|.*)\:||')
1462+
fi
1463+
if [ $(echo $TMPPARTS | grep -o "\:" | wc -l) == 1 ]; then
1464+
replace_fn SIMMANUFACTURER "\"$SIMMANUFACTURER\"" "\"$(echo $TMPPARTS | cut -f 1 -d ':')\"" $LATEFILE
1465+
replace_fn SIMMODEL "\"$SIMMODEL\"" "\"$(echo $TMPPARTS | cut -f 2 -d ':')\"" $LATEFILE
1466+
else
1467+
replace_fn SIMMANUFACTURER "\"$SIMMANUFACTURER\"" "\"\"" $LATEFILE
1468+
replace_fn SIMMODEL "\"$SIMMODEL\"" "\"\"" $LATEFILE
14931469
fi
14941470
# Load module values
14951471
. $LATEFILE
@@ -1510,7 +1486,7 @@ set_partition_props() {
15101486
else
15111487
TMPPROP="$(echo "$2" | sed "s|\.${TMPPART}||").${PART}.${TMPPART}"
15121488
fi
1513-
if [ "$(resetprop $TMPPROP)" ]; then
1489+
if [ "$(getprop $TMPPROP)" ]; then
15141490
log_handler "Changing/writing $TMPPROP."
15151491
if [ "$1" ]; then
15161492
echo "${TMPPROP}=${3}" >> $1
@@ -1546,7 +1522,7 @@ dev_sim_edit() {
15461522
TMPVALUE=$(get_file_value $LATEFILE "SIM${TMPPROP}=")
15471523
if [ "TMPVALUE" ]; then
15481524
if [ "$TMPENB" == 1 ] && [ "$TMPVALUE" ]; then
1549-
if [ "$(resetprop $ITEM)" ]; then
1525+
if [ "$(getprop $ITEM)" ]; then
15501526
log_handler "Changing/writing $ITEM."
15511527
if [ "$1" ]; then
15521528
echo "${ITEM}=${TMPVALUE}" >> $1
@@ -1964,7 +1940,7 @@ reset_delprop() {
19641940
# Export all settings to a module configuration file
19651941
export_settings() {
19661942
before_change
1967-
log_handler "Exporting module settings."
1943+
log_handler "Exporting module settings to $EXPORTFILE."
19681944
# Load settings
19691945
. $LATEFILE
19701946
# Create export directory
@@ -2042,7 +2018,7 @@ collect_logs() {
20422018
done
20432019

20442020
# Saving the current prop values
2045-
resetprop > $TMPLOGLOC/currentprops
2021+
getprop > $TMPLOGLOC/currentprops
20462022
sed -i -e "s|\]\:\ \[|=|g;s|^\[||g;s|\]$||g" $TMPLOGLOC/currentprops
20472023

20482024
# Saving the log file

‎module.prop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id=MagiskHidePropsConf
22
name=MagiskHide Props Config
3-
version=v5.2.2-v78
4-
versionCode=55
3+
version=v5.2.3-v79
4+
versionCode=56
55
author=Didgeridoohan
66
description=Change your device's fingerprint, to pass SafetyNet's CTS Profile check. Set/reset prop values set by MagiskHide. Change any prop values easily, and set your own custom props.

‎post-fs-data.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
echo -e $STRST > $RUNFILE 2>&1
4141

4242
# Save default prop values
43-
resetprop > $MHPCPATH/defaultprops
43+
getprop > $MHPCPATH/defaultprops
4444
echo "" >> $LOGFILE 2>&1
4545
echo -e "$(date +"%Y-%m-%d %H:%M:%S:%N") - Saved default values" >> $LOGFILE 2>&1
4646

‎system/binpath/props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1794,7 +1794,7 @@ menu_edit_custprop() {
17941794
for ITEM in $CUSTOMPROPSLIST; do
17951795
TMPITEM=$(echo $(get_eq_right "$ITEM") | sed 's|_sp_| |g')
17961796
if [ "$(get_eq_left "$ITEM")" == "$1" ]; then
1797-
if [ "$TMPITEM" == "$(resetprop $1)" ]; then
1797+
if [ "$TMPITEM" == "$(getprop $1)" ]; then
17981798
PROPNOTSET=0
17991799
else
18001800
PROPNOTSET=1
@@ -1808,7 +1808,7 @@ menu_edit_custprop() {
18081808
echo "The current value for"
18091809
echo "${C}'$1'${N} is:"
18101810
echo ""
1811-
echo "${C}$(resetprop $1)${N}"
1811+
echo "${C}$(getprop $1)${N}"
18121812
if [ "$PROPNOTSET" == 0 ]; then
18131813
echo "(Set by this module.)"
18141814
echo ""
@@ -1864,7 +1864,7 @@ menu_edit_custprop() {
18641864
;;
18651865
*)
18661866
if [ "$PROPNOTSET" == 0 ]; then
1867-
menu_set_custprop "$1" "$INPUT3" "$(resetprop $1)"
1867+
menu_set_custprop "$1" "$INPUT3" "$(getprop $1)"
18681868
break
18691869
else
18701870
invalid_input 1 3
@@ -1984,7 +1984,7 @@ menu_magiskhide_custprop() {
19841984
# Fourth menu level - Set new custom prop
19851985
menu_set_new_custprop() {
19861986
INPUT4=""
1987-
TMPPROP=$(resetprop "$1")
1987+
TMPPROP=$(getprop "$1")
19881988
while true
19891989
do
19901990
if [ -z "$INPUT4" ]; then
@@ -2461,7 +2461,7 @@ menu_reset_all_delprop() {
24612461
# Fourth menu level - Set new prop to delete
24622462
menu_set_new_delprop() {
24632463
INPUT4=""
2464-
TMPPROP=$(resetprop "$1")
2464+
TMPPROP=$(getprop "$1")
24652465
while true
24662466
do
24672467
if [ -z "$INPUT4" ]; then

0 commit comments

Comments
 (0)