Skip to content

Commit c6b4db3

Browse files
DidgeridoohanDidgeridoohan
authored
v2.7.1-v39
1 parent c7b34b1 commit c6b4db3

File tree

5 files changed

+50
-20
lines changed

5 files changed

+50
-20
lines changed

‎README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ The fingerprints list will update without the need to update the entire module.
156156

157157
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.
158158

159-
**_Current fingerprints list version - v38_**
159+
**_Current fingerprints list version - v39_**
160160

161161

162162
## Please add support for device X
@@ -310,6 +310,11 @@ Releases from v2.4.1 are compatible with Magisk v17+.
310310

311311

312312
## Changelog
313+
### v2.7.1
314+
- Fixed an issue when users create custom prints list and configuration files with Windows file endings.
315+
- Fixed an issue where the currently picked device wouldn't show for the custom prints list.
316+
- 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.
317+
313318
### v2.7.0
314319
- 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.
315320
- 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+.
494499

495500

496501
## Current fingerprints list
497-
### List v38
502+
### List v39
498503
- Asus Zenfone 2 Laser (6.0.1)
499504
- Asus Zenfone 4 Max (7.1.1)
500505
- Asus ZenPad S 8.0 (6.0.1)
@@ -604,6 +609,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
604609
- Sony Xperia Z3 (6.0.1)
605610
- Sony Xperia Z3 Compact (6.0.1)
606611
- Sony Xperia Z3 Tablet Compact (6.0.1)
612+
- Sony Xperia Z4 Tablet LTE (7.1.1)
607613
- Sony Xperia Z5 (7.1.1)
608614
- Sony Xperia Z5 Compact (7.1.1)
609615
- Sony Xperia Z5 Dual (7.1.1)
@@ -618,6 +624,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
618624
- Xiaomi Mi 6 (8.0.0)
619625
- Xiaomi Mi 8 (8.1.0)
620626
- Xiaomi Mi A1 (8.0.0)
627+
- Xiaomi Mi A2 (8.1.0)
621628
- Xiaomi Mi Max 2 (7.1.1)
622629
- Xiaomi Mi Mix 2 (8.0.0)
623630
- Xiaomi Mi Mix 2S (8.0.0)
@@ -635,6 +642,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
635642
- Xiaomi Redmi Note 5/5 Plus (7.1.2)
636643
- Xiaomi Redmi Note 5 Pro (8.1.0)
637644
- Xiaomi Redmi Note 5A Lite (7.1.2)
645+
- Xiaomi Redmi Y1 (7.1.2)
638646
- ZTE Axon 7 (8.0.0)
639647
- ZTE Blade (6.0.1)
640648
- ZTE Nubia Z17 (7.1.1)

‎common/prints.sh

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@
33
# MagiskHide Props Config
44
# By Didgeridoohan @ XDA Developers
55

6-
PRINTSV=38
6+
PRINTSV=39
77
PRINTSTRANSF=250
88

99
# Certified fingerprints
1010
PRINTSLIST="
1111
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
1212
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
1313
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
14-
Essential PH-1 (9)=essential/mata/mata:9/PPR1.181005.076/390:user/release-keys__2018-11-05
14+
Essential PH-1 (9)=essential/mata/mata:9/PPR1.181005.099/413:user/release-keys__2018-12-05
1515
Google Nexus 4 (5.1.1)=google/occam/mako:5.1.1/LMY48T/2237560:user/release-keys
1616
Google Nexus 5 (6.0.1)=google/hammerhead/hammerhead:6.0.1/M4B30Z/3437181:user/release-keys
17-
Google Nexus 5x (8.1.0)=google/bullhead/bullhead:8.1.0/OPM7.181105.004/5038062:user/release-keys__2018-11-05
17+
Google Nexus 5X (8.1.0)=google/bullhead/bullhead:8.1.0/OPM7.181205.001/5080180:user/release-keys__2018-12-05
1818
Google Nexus 6 (7.1.1)=google/shamu/shamu:7.1.1/N6F27M/4299435:user/release-keys
19-
Google Nexus 6P (8.1.0)=google/angler/angler:8.1.0/OPM7.181105.004/5038062:user/release-keys__2018-11-05
19+
Google Nexus 6P (8.1.0)=google/angler/angler:8.1.0/OPM7.181205.001/5080180:user/release-keys__2018-12-05
2020
Google Nexus 7 2012 WiFi (5.1.1)=google/nakasi/grouper:5.1.1/LMY47V/1836172:user/release-keys
2121
Google Nexus 7 2012 LTE (5.1.1)=google/nakasig/tilapia:5.1.1/LMY47V/1836172:user/release-keys
2222
Google Nexus 7 2013 WiFi (6.0.1)=google/razor/flo:6.0.1/MOB30X/3036618:user/release-keys
2323
Google Nexus 7 2013 LTE (6.0.1)=google/razorg/deb:6.0.1/MOB30X/3036618:user/release-keys
2424
Google Nexus 9 WiFi ()=google/volantis/flounder:7.1.1/N9F27M/4333998:user/release-keys
2525
Google Nexus 9 LTE (7.1.1)=google/volantisg/flounder_lte:7.1.1/N4F27P/4333386:user/release-keys
2626
Google Nexus 10 (5.1.1)=google/mantaray/manta:5.1.1/LMY49J/2640980:user/release-keys
27-
Google Pixel (9)=google/sailfish/sailfish:9/PPR2.181005.003/4984323:user/release-keys__2018-10-05
28-
Google Pixel XL (9)=google/marlin/marlin:9/PPR2.181005.003/4984323:user/release-keys__2018-10-05
29-
Google Pixel 2 (9)=google/walleye/walleye:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
30-
Google Pixel 2 XL (9)=google/taimen/taimen:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
31-
Google Pixel 3 (9)=google/blueline/blueline:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
32-
Google Pixel 3 XL (9)=google/crosshatch/crosshatch:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
33-
Google Pixel C (8.1.0)=google/ryu/dragon:8.1.0/OPM8.181105.002/5038063:user/release-keys__2018-11-05
27+
Google Pixel (9)=google/sailfish/sailfish:9/PQ1A.181205.002.A1/5129870:user/release-keys__2018-12-05
28+
Google Pixel XL (9)=google/marlin/marlin:9/PQ1A.181205.002.A1/5129870:user/release-keys__2018-12-05
29+
Google Pixel 2 (9)=google/walleye/walleye:9/PQ1A.181205.002/5086253:user/release-keys__2018-12-05
30+
Google Pixel 2 XL (9)=google/taimen/taimen:9/PQ1A.181205.002/5086253:user/release-keys__2018-12-05
31+
Google Pixel 3 (9)=google/blueline/blueline:9/PQ1A.181205.006/5108886:user/release-keys__2018-12-05
32+
Google Pixel 3 XL (9)=google/crosshatch/crosshatch:9/PQ1A.181205.006/5108886:user/release-keys__2018-12-05
33+
Google Pixel C (8.1.0)=google/ryu/dragon:8.1.0/OPM8.181205.001/5080184:user/release-keys__2018-12-05
3434
HTC 10 (6.0.1)=htc/HTCOneM10vzw/htc_pmewl:6.0.1/MMB29M/774095.8:user/release-keys
3535
HTC U11 (8.0.0)=htc/ocndtwl_01405/htc_ocndtwl:8.0.0/OPR6.170623.013/1017190.2:user/release-keys
3636
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
105105
Sony Xperia XZ Premium (8.0.0)=Sony/G8141/G8141:8.0.0/47.1.A.12.179/1909673090:user/release-keys
106106
Sony Xperia XZ Premium Dual (8.0.0)=Sony/G8142/G8142:8.0.0/47.1.A.12.179/1909673090:user/release-keys
107107
Sony Xperia XZ1 (8.0.0)=Sony/G8341/G8341:8.0.0/47.1.A.12.179/1909673090:user/release-keys
108-
Sony Xperia XZ1 Compact (8.0.0)=Sony/G8441/G8441:8.0.0/47.1.A.12.179/1909673090:user/release-keys
108+
Sony Xperia XZ1 Compact (9)=Sony/G8441/G8441:9/47.2.A.2.33/3676206253:user/release-keys__2018-11-01
109109
Sony Xperia XZ1 Dual (8.0.0)=Sony/G8342/G8342:8.0.0/47.1.A.12.179/1909673090:user/release-keys
110110
Sony Xperia XZ2 (8.0.0)=Sony/H8216/H8216:8.0.0/51.1.A.3.159/620448843:user/release-keys
111111
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
117117
Sony Xperia Z3 (6.0.1)=Sony/D6633/D6633:6.0.1/23.5.A.1.291/2769308465:user/release-keys
118118
Sony Xperia Z3 Compact (6.0.1)=Sony/D5803/D5803:6.0.1/23.5.A.1.291/2769308465:user/release-keys
119119
Sony Xperia Z3 Tablet Compact (6.0.1)=Sony/SGP621/SGP621:6.0.1/23.5.A.1.291/3706784398:user/release-keys
120+
Sony Xperia Z4 Tablet LTE (7.1.1)=Sony/SGP771/SGP771:7.1.1/32.4.A.1.54/219395100:user/release-keys
120121
Sony Xperia Z5 (7.1.1)=Sony/E6603/E6603:7.1.1/32.4.A.1.54/3761073091:user/release-keys
121122
Sony Xperia Z5 Compact (7.1.1)=Sony/E5823/E5823:7.1.1/32.4.A.1.54/3761073091:user/release-keys
122123
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/
131132
Xiaomi Mi 6 (8.0.0)=Xiaomi/sagit/sagit:8.0.0/OPR1.170623.027/V9.2.3.0.OCAMIEK:user/release-keys
132133
Xiaomi Mi 8 (8.1.0)=Xiaomi/dipper/dipper:8.1.0/OPM1.171019.011/V9.5.5.0.OEAMIFA:user/release-keys
133134
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
135+
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
134136
Xiaomi Mi Max 2 (7.1.1)=Xiaomi/oxygen/oxygen:7.1.1/NMF26F/V9.5.4.0.NDDMIFA:user/release-keys
135137
Xiaomi Mi Mix 2 (8.0.0)=Xiaomi/chiron/chiron:8.0.0/OPR1.170623.027/V9.6.1.0.ODEMIFD:user/release-keys
136138
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
148150
Xiaomi Redmi Note 5/5 Plus (7.1.2)=xiaomi/vince/vince:7.1.2/N2G47H/V9.5.4.0.NEGMIFA:user/release-keys
149151
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
150152
Xiaomi Redmi Note 5A Lite (7.1.2)=xiaomi/ugglite/ugglite:7.1.2/N2G47H/V9.1.2.0.NDFMIEI:user/release-keys
153+
Xiaomi Redmi Y1 (7.1.2)=xiaomi/ugg/ugg:7.1.2/N2G47H/V9.6.2.0.NDKMIFD:user/release-keys__2018-07-01
151154
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
152155
ZTE Blade (6.0.1)=ZTE/P809A50_MY_MAX/P809A50:6.0.1/MMB29M/20161017.095504:user/release-keys
153156
ZTE Nubia Z17 (7.1.1)=nubia/NX563J/NX563J:7.1.1/NMF26X/eng.nubia.20171019.101529:user/release-keys

‎common/util_functions.sh

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ get_device_used() {
176176
if [ "$PRINTTMP" ]; then
177177
echo "${C}$(get_eq_left "$PRINTTMP" | sed "s| (.*||")${N}"
178178
echo ""
179+
elif [ -s "$CSTMPRINTS" ]; then
180+
PRINTTMP=$(cat $CSTMPRINTS | grep "$1")
181+
if [ "$PRINTTMP" ]; then
182+
echo "${C}$(get_eq_left "$PRINTTMP" | sed "s| (.*||")${N} (from custom list)"
183+
echo ""
184+
fi
179185
fi
180186
}
181187

@@ -206,6 +212,17 @@ replace_fn() {
206212
sed -i "s|${1}=${2}|${1}=${3}|" $4
207213
}
208214

215+
# Format user files
216+
format_file() {
217+
log_handler "Formating file (${1})."
218+
# Remove Windows line endings
219+
sed -i 's/\r$//' $1
220+
# Check for newline at EOF
221+
if [ ! -z "$(tail -c 1 "$1")" ]; then
222+
echo "" >> $1
223+
fi
224+
}
225+
209226
# Updates placeholders
210227
placeholder_update() {
211228
FILEVALUE=$(get_file_value $1 "$2=")
@@ -374,8 +391,9 @@ orig_safe() {
374391
# Checks for configuration file
375392
config_file() {
376393
log_handler "Checking for configuration file."
377-
if [ -f "$CONFFILE" ]; then
394+
if [ -s "$CONFFILE" ]; then
378395
log_handler "Configuration file detected (${CONFFILE})."
396+
format_file $CONFFILE
379397
# Loads custom variables
380398
. $CONFFILE
381399
# Updates prop values (including fingerprint)

‎module.prop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
id=MagiskHidePropsConf
22
name=MagiskHide Props Config
3-
version=v2.7.0-v38
4-
versionCode=34
3+
version=v2.7.1-v39
4+
versionCode=35
55
author=Didgeridoohan
66
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.
77
minMagisk=17000

‎system/binpath/props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,9 @@ menu_pick_print() {
333333
OEMLIST="$(ls $PRINTFILES | sed 's|\.sh||g')"
334334
if [ "$OEMLIST" ]; then
335335
# Check for custom fingerprints list
336-
if [ -f "$CSTMPRINTS" ] && [ ! -f "$CSTMFILE" ]; then
336+
if [ -s "$CSTMPRINTS" ] && [ ! -f "$CSTMFILE" ]; then
337337
log_handler "Found custom fingerprints list."
338+
format_file $CSTMPRINTS
338339
log_handler "Creating custom prints file."
339340
cat $CSTMPRINTS >> $LOGFILE 2>&1 && echo "" >> $LOGFILE 2>&1
340341
echo -e "PRINTSLIST=\"" >> $CSTMFILE
@@ -375,7 +376,7 @@ menu_pick_print() {
375376
break
376377
fi
377378
fi
378-
if [ "$INPUT3" -ge 1 ] && [ "$INPUT3" -le "$ITEMCOUNT" ]; then
379+
if [ "$INPUT3" -ge 1 ] && [ "$INPUT3" -lt "$ITEMCOUNT" ]; then
379380
ITEMCOUNT=1
380381
for ITEM in $OEMLIST; do
381382
if [ "$ITEMCOUNT" == "$INPUT3" ]; then
@@ -441,7 +442,7 @@ menu_pick_print_sub() {
441442
echo -n "Enter '${G}e${N}' to exit: "
442443
read -r INPUT4
443444
fi
444-
if [ "$INPUT4" -ge 1 ] && [ "$INPUT4" -le "$ITEMCOUNT" ]; then
445+
if [ "$INPUT4" -ge 1 ] && [ "$INPUT4" -lt "$ITEMCOUNT" ]; then
445446
ITEMCOUNT=1
446447
SAVEIFS=$IFS
447448
IFS=$(echo -en "\n\b")

0 commit comments

Comments
 (0)