diff --git a/README.md b/README.md index 8a2fb31..2a2aa06 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,8 @@ Keep in mind that this module cannot help you pass CTS if your device uses hardw - [Prop script settings](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#prop-script-settings) - [Boot stage](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#boot-stage) - [Script colours](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#script-colours) - - [Fingerprints list check](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#fingerprints-list-check) + - [Automatic module update check](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#automatic-module-update-check) + - [Automatic update of fingerprints list](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#automatic-update-of-fingerprints-list) - [Automatic fingerprint update](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#automatic-fingerprint-update) - [Background boot script](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#background-boot-script) - [Export settings](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config/blob/master/README.md#export-settings) @@ -114,16 +115,18 @@ this information to the module settings as custom prop values. Options: - -d Update to fingerprints test list. - -f Update fingerprints list. - -l Save module logs and info. - -h Show this message. + -d *Update to fingerprints test list during start. + -f *Update fingerprints list during start. + -l *Save module logs and info. + -h *Show this message. -nc Run without colours. - -nw Run without fingerprint startup check. - -r Reset all options/settings. - -s Open script settings menu. + -nw Run without connecting to the web during start. + -r *Reset all options/settings. + -s *Open script settings menu. -t Activate test mode. + -u *Perform a module update check during start. ``` +Options marked with an asterisk (\*) cannot be combined with each other. The settings option (-s) can be used even if the module boot scripts did not run. @@ -234,11 +237,11 @@ In case you can't get the Play Store to report your device as "certified", see [ ## Current fingerprints list version The fingerprints list will update without the need to update the entire module. Keep an eye on the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-t3789228) for info. -Just run the `props` command and the list will be updated automatically. Use the -nw option to run the script without updating the list 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 or by running the `props` command with the -f option. +Just run the `props` command and the list will be updated automatically. Use the -nw option to run the script without updating the list 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 or by running the `props` command with the -f run option. 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 - v101_** +**_Current fingerprints list version - v102_** ## Please add support for device X @@ -335,7 +338,7 @@ If you would like to delete a certain prop value from your system, that can be d ## Prop script settings -There are a couple of persistent options that you can set for the `props` script. These are currently "Boot stage", "Script colours" and "Fingerprints list check". The options are found under "Script settings" when running the `props` script. The settings menu can also be opened by using the -s option (use -h for details). +There are a couple of persistent options that you can set for the `props` script. These are currently "Boot stage", "Script colours" and "Fingerprints list check". The options are found under "Script settings" when running the `props` script. The settings menu can also be opened by using the -s run option (use -h for details). ### Boot stage It's possible to move the execution of the boot script from the default system.prop file to either post-fs-data or late_start service. If there are any kind of issues during boot or that props don't set properly, try changing the boot stage to either post-fs-data or late_start service instead. Just keep in mind that this might cause other issues like the fingerprint not setting properly (if set during late_start service) or that post-fs-data will be interupted by having too many props causing the script to run too slow. @@ -347,8 +350,11 @@ Note: post-fs-data runs earlier than system.prop and late_start service runs aft ### Script colours This option will disable or enable colours for the `props` script. -### Fingerprints list check -This option will disable or enable the automatic updating of the fingerprints list when the `props` script starts. If the fingerprints list check is disabled, the list can be manually updated from within the script, under the `Edit device fingerprint` menu, or with the -f option (use -h for details). +### Automatic module update check +This option will disable or enable the automatic check for a module update when the `props` script starts. If the update check is disabled, it can still be performed manually from within the script, in the main menu, or with the -u run option (use -h for details). + +### Automatic update of fingerprints list +This option will disable or enable the automatic updating of the fingerprints list when the `props` script starts. If the fingerprints list check is disabled, the list can be manually updated from within the script, under the `Edit device fingerprint` menu, or with the -f run option (use -h for details). ### Automatic fingerprint update Whenever there is an update to the fingerprints list and if you have a fingerprint applied for a device that is on the list, the fingerprint will automatically be updated (if there is an update to that particular fingerprint). This option will not update a fingerprint to one for a different Android version if there are several fingerprints available for the same device. @@ -457,7 +463,7 @@ This is caused by the [MagiskHide Sensitive props](https://github.com/Magisk-Mod If your device's Play Store reports that the device is "uncertified", this is usually fixed by making sure that you pass SafetyNet and then clearing data for the Play Store (and possibly rebooting). More details in the [Magisk troubleshooting guide](https://www.didgeridoohan.com/magisk/MagiskHide#hn_Device_uncertified_in_Play_storeNetflix_and_other_apps_wont_install_or_doesnt_show_up). ## Logs -In case of issues, please provide the logs by running the `props` script and selecting the "Collect logs" option (or running the `props` script with the -l option, use -h for details). All the relevant logs and module files, together with the Magisk log, the stock build.prop file and current prop values will be packaged into a file that'll be stored in the root of the device's internal storage, ready for attaching to a post in the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-t3789228), together with a detailed description of your problem. +In case of issues, please provide the logs by running the `props` script and selecting the "Collect logs" option (or running the `props` script with the -l run option, use -h for details). All the relevant logs and module files, together with the Magisk log, the stock build.prop file and current prop values will be packaged into a file that'll be stored in the root of the device's internal storage, ready for attaching to a post in the [module support thread](https://forum.xda-developers.com/apps/magisk/module-magiskhide-props-config-t3789228), together with a detailed description of your problem. The logs will also automatically be saved to the root of the device's internal storage if there's an issue with the module scripts. @@ -496,6 +502,14 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. Releases from v5.2.5 will only install on Magisk v20+. ## Changelog +### V5.3.4 +- Added a module update check option. See the documentation for details. +- Added `system_ext` to the list of partitions used for certain props (thank you @simonsmh). +- Fixed an edge case where changing settings after updating the module, but not having rebooted yet would cause issues with system.prop being kept from the previous version. +- Fixed the -nw run option and made sure that some run options can't be picked together. See the documentation for details. +- Cleaned up some unused variables. +- Added print for Sony Xperia 10 II Dual XQ-AU52. Updated fingerprints for Google Pixel 2, 2 XL, 4, 4 XL and 4a, OnePlus 8 IN2015 and 8 Pro In2025 and Xiaomi Mi 10 Global, Mi 10 Pro and Pocophone F1. List updated to v102. + ### v5.3.3 - More (very) minor ui tweaks. - Added fingerprint for Samsung Galaxy J7 Neo SM-J701M. Updated fingerprints for OnePlus 8 IN2013, 8 Pro IN2023, Nord AC2001, Nord European AC2003 and Nord Global AC2003 and Samsung Galaxy Tab S5e SM-T720. List updated to v5. @@ -867,7 +881,7 @@ Releases from v5.2.5 will only install on Magisk v20+. ## Current fingerprints list -### List v101 +### List v102 - Asus ZenFone 2 Laser ASUS_Z00LD (6.0.1) - Asus ZenFone 3 Max ASUS_X00DD (7.1.1 & 8.1.0) - Asus ZenFone 4 Max ASUS_X00HD (7.1.1) @@ -905,7 +919,7 @@ Releases from v5.2.5 will only install on Magisk v20+. - Google Pixel 3a XL (9 & 10 & 11) - Google Pixel 4 (10 & 11) - Google Pixel 4 XL (10 & 11) -- Google Pixel 4a (10) +- Google Pixel 4a (10 & 11) - Google Pixel C (6.0.1 & 7.0 & 7.1.1 & 7.1.2 & 8.0.0 & 8.1.0) - HTC 10 (6.0.1) - HTC U11 (8.0.0) @@ -1013,7 +1027,7 @@ Releases from v5.2.5 will only install on Magisk v20+. - OnePlus 7T HD1901 (10) - OnePlus 7T HD1903 (10) - OnePlus 7T HD1905 (10) -- OnePlus 7 Pro HD1910 (10) +- OnePlus 7T Pro HD1910 (10) - OnePlus 7T Pro HD1911 (10) - OnePlus 7T Pro HD1913 (10) - OnePlus 7T Pro HD1917 (10) @@ -1021,13 +1035,13 @@ Releases from v5.2.5 will only install on Magisk v20+. - OnePlus 8 IN2010 (10) - OnePlus 8 IN2011 (10) - OnePlus 8 IN2013 (10) -- OnePlus 8 IN2015 (10) +- OnePlus 8 IN2015 (10 & 11) - OnePlus 8 IN2017 (10) - OnePlus 8 IN2019 (10) - OnePlus 8 Pro IN2020 (10) - OnePlus 8 Pro IN2021 (10) - OnePlus 8 Pro IN2023 (10) -- OnePlus 8 Pro IN2025 (10) +- OnePlus 8 Pro IN2025 (10 & 11) - OnePlus Nord AC2001 (10) - OnePlus Nord European AC2003 (10) - OnePlus Nord Global AC2003 (10) @@ -1112,6 +1126,7 @@ Releases from v5.2.5 will only install on Magisk v20+. - Samsung Galaxy Tab S4 SM-T830 (10) - Samsung Galaxy Tab S5e SM-T720 (9 & 10) - Sony Xperia 5 DSDS J9210 (10) +- Sony Xperia 10 II Dual XQ-AU52 (10) - Sony Xperia M (4.3) - Sony Xperia X F5121 (8.0.0) - Sony Xperia X Compact F5321 (8.0.0) @@ -1161,9 +1176,9 @@ Releases from v5.2.5 will only install on Magisk v20+. - Xiaomi Mi 9T Global (10) - Xiaomi Mi 9T Pro (9 & 10) - Xiaomi MI 10 European (10) -- Xiaomi Mi 10 Global (10) +- Xiaomi Mi 10 Global (10 & 11) - Xiaomi Mi 10 Lite 5G (10) -- Xiaomi Mi 10 Pro (10) +- Xiaomi Mi 10 Pro (10 & 11) - Xiaomi Mi A1 (7.1.2 & 8.0.0 & 8.1.0 & 9) - Xiaomi Mi A2 (8.1.0 & 9 & 10) - Xiaomi Mi A2 Lite (8.1.0 & 9 & 10) diff --git a/common/prints.sh b/common/prints.sh index 40393ac..6b1f002 100644 --- a/common/prints.sh +++ b/common/prints.sh @@ -4,12 +4,12 @@ # Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers # Licence: MIT -PRINTSV=101 +PRINTSV=102 PRINTSTRANSF=520 # Certified fingerprints -# Current fingerprints count=496 -# Unique devices=346 +# Current fingerprints count=505 +# Unique devices=347 PRINTSLIST=" Asus ZenFone 2 Laser ASUS_Z00LD (6.0.1):Asus:ASUS_Z00LD=asus/WW_Z00L/ASUS_Z00L_63:6.0.1/MMB29P/WW_user_21.40.1220.2196_20180308:user/release-keys Asus ZenFone 3 Max ASUS_X00DD (7.1.1 & 8.1.0):Asus:ASUS_X00DD=asus/WW_Phone/ASUS_X00DD:7.1.1/NMF26F/14.0200.1712.347-20171214:user/release-keys;asus/WW_Phone/ASUS_X00DD:8.1.0/OPM1.171019.011/15.0200.1812.503-0:user/release-keys__2018-12-05 @@ -40,15 +40,15 @@ Google Nexus 10 (5.1.1):Samsung:Nexus 10=google/mantaray/manta:5.1.1/LMY49J/2640 Google Nexus Player (5.0 & 5.1 & 5.1.1 & 6.0.1 & 7.0 & 7.1.1 & 7.1.2 & 8.0.0):Asus:Nexus Player=google/fugu/fugu:5.0/LRX21V/1586762:user/release-keys;google/fugu/fugu:5.1/LMY47D/1743759:user/release-keys;google/fugu/fugu:5.1.1/LMY48N/2167335:user/release-keys;google/fugu/fugu:6.0.1/MOB30W/3031100:user/release-keys;google/fugu/fugu:7.0/NRD91N/3318108:user/release-keys;google/fugu/fugu:7.1.1/NMF27D/3783773:user/release-keys;google/fugu/fugu:7.1.2/N2G48C/4104010:user/release-keys;google/fugu/fugu:8.0.0/OPR2.170623.027/4397545:user/release-keys Google Pixel (7.1 & 7.1.1 & 7.1.2 & 8.0.0 & 8.1.0 & 9 & 10):Google:Pixel=google/sailfish/sailfish:7.1/NDE63V/3389651:user/release-keys;google/sailfish/sailfish:7.1.1/NOF27D/3757586:user/release-keys;google/sailfish/sailfish:7.1.2/NJH47F/4146041:user/release-keys;google/sailfish/sailfish:8.0.0/OPR3.170623.013/4397526:user/release-keys;google/sailfish/sailfish:8.1.0/OPM4.171019.021.P1/4820305:user/release-keys__2018-07-05;google/sailfish/sailfish:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/sailfish/sailfish:10/QP1A.191005.007.A3/5972272:user/release-keys__2019-10-06 Google Pixel XL (7.1 & 7.1.1 & 7.1.2 & 8.0.0 & 8.1.0 & 9 & 10):Google:Pixel XL=google/marlin/marlin:7.1/NDE63V/3389651:user/release-keys;google/marlin/marlin:7.1.1/NOF27D/3757586:user/release-keys;google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys;google/marlin/marlin:8.0.0/OPR3.170623.013/4397526:user/release-keys;google/marlin/marlin:8.1.0/OPM4.171019.021.P1/4820305:user/release-keys__2018-07-05;google/marlin/marlin:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/marlin/marlin:10/QP1A.191005.007.A3/5972272:user/release-keys__2019-10-06 -Google Pixel 2 (8.0.0 & 8.1.0 & 9 & 10 & 11):Google:Pixel 2=google/walleye/walleye:8.0.0/OPD1.170816.025/4424668:user/release-keys;google/walleye/walleye:8.1.0/OPM2.171026.006.G1/4820017:user/release-keys__2018-07-05;google/walleye/walleye:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/walleye/walleye:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/walleye/walleye:11/RPB3.200720.005/6705141:user/release-keys__2020-08-05 -Google Pixel 2 XL (8.0.0 & 8.1.0 & 9 & 10 & 11):Google:Pixel 2 XL=google/taimen/taimen:8.0.0/OPD1.170816.025/4424668:user/release-keys;google/taimen/taimen:8.1.0/OPM2.171026.006.H1/4833802:user/release-keys__2018-07-05;google/taimen/taimen:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/taimen/taimen:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/taimen/taimen:11/RPB3.200720.005/6705141:user/release-keys__2020-08-05 +Google Pixel 2 (8.0.0 & 8.1.0 & 9 & 10 & 11):Google:Pixel 2=google/walleye/walleye:8.0.0/OPD1.170816.025/4424668:user/release-keys;google/walleye/walleye:8.1.0/OPM2.171026.006.G1/4820017:user/release-keys__2018-07-05;google/walleye/walleye:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/walleye/walleye:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/walleye/walleye:11/RP1A.200720.009/6720564:user/release-keys__2020-09-05 +Google Pixel 2 XL (8.0.0 & 8.1.0 & 9 & 10 & 11):Google:Pixel 2 XL=google/taimen/taimen:8.0.0/OPD1.170816.025/4424668:user/release-keys;google/taimen/taimen:8.1.0/OPM2.171026.006.H1/4833802:user/release-keys__2018-07-05;google/taimen/taimen:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/taimen/taimen:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/taimen/taimen:11/RP1A.200720.009/6720564:user/release-keys__2020-09-05 Google Pixel 3 (9 & 10 & 11):Google:Pixel 3=google/blueline/blueline:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/blueline/blueline:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/blueline/blueline:11/RPB3.200720.005/6705141:user/release-keys__2020-08-05 Google Pixel 3 XL (9 & 10 & 11):Google:Pixel 3 XL=google/crosshatch/crosshatch:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/crosshatch/crosshatch:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/crosshatch/crosshatch:11/RPB3.200720.005/6705141:user/release-keys__2020-08-05 Google Pixel 3a (9 & 10 & 11):Google:Pixel 3a=google/sargo/sargo:9/PQ3B.190801.002/5674421:user/release-keys__2019-08-01;google/sargo/sargo:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/sargo/sargo:11/RPB3.200720.005/6705141:user/release-keys__2020-08-05 Google Pixel 3a XL (9 & 10 & 11):Google:Pixel 3a XL=google/bonito/bonito:9/PQ3B.190801.002/5674421:user/release-keys__2019-08-01;google/bonito/bonito:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/bonito/bonito:11/RPB3.200720.005/6705141:user/release-keys__2020-08-05 -Google Pixel 4 (10 & 11):Google:Pixel 4=google/flame/flame:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/flame/flame:11/RPB3.200720.005/6705141:user/release-keys__2020-08-05 -Google Pixel 4 XL (10 & 11):Google:Pixel 4 XL=google/coral/coral:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/coral/coral:11/RPB3.200720.005/6705141:user/release-keys__2020-08-05 -Google Pixel 4a (10):Google:Pixel 4a=google/sunfish/sunfish:10/QD4A.200805.003/6598198:user/release-keys__2020-08-05 +Google Pixel 4 (10 & 11):Google:Pixel 4=google/flame/flame:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/flame/flame:11/RP1A.200720.009/6720564:user/release-keys__2020-09-05 +Google Pixel 4 XL (10 & 11):Google:Pixel 4 XL=google/coral/coral:10/QQ3A.200805.001/6578210:user/release-keys__2020-08-05;google/coral/coral:11/RP1A.200720.009/6720564:user/release-keys__2020-09-05 +Google Pixel 4a (10 & 11):Google:Pixel 4a=google/sunfish/sunfish:10/QD4A.200805.003/6598198:user/release-keys__2020-08-05;google/sunfish/sunfish:11/RP1A.200720.011/6746289:user/release-keys__2020-09-05 Google Pixel C (6.0.1 & 7.0 & 7.1.1 & 7.1.2 & 8.0.0 & 8.1.0):Google:Pixel C=google/ryu/dragon:6.0.1/MXC89L/3084571:user/release-keys;google/ryu/dragon:7.0/NRD91N/3318108:user/release-keys;google/ryu/dragon:7.1.1/N4F26T/3687331:user/release-keys;google/ryu/dragon:7.1.2/N2G48C/4104010:user/release-keys;google/ryu/dragon:8.0.0/OPR1.170623.032/4397478:user/release-keys;google/ryu/dragon:8.1.0/OPM8.190605.005/5749003:user/release-keys__2019-06-05 HTC 10 (6.0.1):HTC:HTC 10=htc/HTCOneM10vzw/htc_pmewl:6.0.1/MMB29M/774095.8:user/release-keys HTC U11 (8.0.0):HTC:HTC U-3w=htc/ocndtwl_01405/htc_ocndtwl:8.0.0/OPR6.170623.013/1017190.2:user/release-keys @@ -164,13 +164,13 @@ OnePlus 7T Pro NR HD1925 (10):OnePlus:HD1925=OnePlus/OnePlus7TProNR/OnePlus7TPro OnePlus 8 IN2010 (10):OnePlus:IN2010=OnePlus/OnePlus8_CH/OnePlus8:10/QKQ1.191222.002/2006300106:user/release-keys__2020-06-01 OnePlus 8 IN2011 (10):OnePlus:IN2011=OnePlus/OnePlus8_IND/OnePlus8:10/QKQ1.191222.002/2008080019:user/release-keys__2020-08-01 OnePlus 8 IN2013 (10):OnePlus:IN2013=OnePlus/OnePlus8_EEA/OnePlus8:10/QKQ1.191222.002/2008150504:user/release-keys__2020-08-01 -OnePlus 8 IN2015 (10):OnePlus:IN2015=OnePlus/OnePlus8/OnePlus8:10/QKQ1.191222.002/2008080019:user/release-keys__2020-08-01 +OnePlus 8 IN2015 (10 & 11):OnePlus:IN2015=OnePlus/OnePlus8/OnePlus8:10/QKQ1.191222.002/2008080019:user/release-keys__2020-08-01;OnePlus/OnePlus8/OnePlus8:11/RP1A.201005.001/2009051300:user/release-keys__2020-09-01 OnePlus 8 IN2017 (10):OnePlus:IN2017=OnePlus/OnePlus8TMO/OnePlus8TMO:10/QKQ1.191222.002/2006102149:user/release-keys__2020-06-01 OnePlus 8 IN2019 (10):OnePlus:IN2019=OnePlus/OnePlus8VZW/OnePlus8VZW:10/QKQ1.191222.002/2004072220:user/release-keys__2020-02-01 OnePlus 8 Pro IN2020 (10):OnePlus:IN2020=OnePlus/OnePlus8Pro_CH/OnePlus8Pro:10/QKQ1.191222.002/2007021926:user/release-keys__2020-06-01 OnePlus 8 Pro IN2021 (10):OnePlus:IN2021=OnePlus/OnePlus8Pro_IND/OnePlus8Pro:10/QKQ1.191222.002/2008080018:user/release-keys__2020-08-01 OnePlus 8 Pro IN2023 (10):OnePlus:IN2023=OnePlus/OnePlus8Pro_EEA/OnePlus8Pro:10/QKQ1.191222.002/2008150503:user/release-keys__2020-08-01 -OnePlus 8 Pro IN2025 (10):OnePlus:IN2025=OnePlus/OnePlus8Pro/OnePlus8Pro:10/QKQ1.191222.002/2008080018:user/release-keys__2020-08-01 +OnePlus 8 Pro IN2025 (10 & 11):OnePlus:IN2025=OnePlus/OnePlus8Pro/OnePlus8Pro:10/QKQ1.191222.002/2008080018:user/release-keys__2020-08-01;OnePlus/OnePlus8Pro/OnePlus8Pro:11/RP1A.201005.001/2009051300:user/release-keys__2020-09-01 OnePlus Nord AC2001 (10):OnePlus:AC2001=OnePlus/Nord_IND/Nord:10/QKQ1.200412.002/2009010217:user/release-keys__2020-07-01 OnePlus Nord European AC2003 (10):OnePlus:AC2003=OnePlus/Nord_EEA/Nord:10/QKQ1.200412.002/2009010216:user/release-keys__2020-07-01 OnePlus Nord Global AC2003 (10):OnePlus:AC2003=OnePlus/Nord/Nord:10/QKQ1.200412.002/2009010217:user/release-keys__2020-07-01 @@ -255,6 +255,7 @@ Samsung Galaxy Tab S3 LTE SM-T825 (8.0.0):Samsung:SM-T825=samsung/gts3lltexx/gts Samsung Galaxy Tab S4 SM-T830 (10):samsung:SM-T830=samsung/gts4lwifixx/gts4lwifi:10/QP1A.190711.020/T830XXU4CTF5:user/release-keys__2020-06-01 Samsung Galaxy Tab S5e SM-T720 (9 & 10):samsung:SM-T720=samsung/gts4lvwifixx/gts4lvwifi:9/PPR1.180610.011/T720XXS1ASL3:user/release-keys__2020-01-01;samsung/gts4lvwifixx/gts4lvwifi:10/QP1A.190711.020/T720XXU1BTG3:user/release-keys__2020-06-01 Sony Xperia 5 DSDS J9210 (10):Sony:J9210=Sony/J9210_RU/J9210:10/55.1.A.9.52/055001A009005201481357772:user/release-keys__2020-07-01 +Sony Xperia 10 II Dual XQ-AU52 (10):Sony:XQ-AU52=Sony/XQ-AU52_EEA/XQ-AU52:10/59.0.A.6.24/059000A006002402956232951:user/release-keys__2020-07-01 Sony Xperia M (4.3):Sony:C1905=Sony/C1905/C1905:4.3/15.4.A.1.9/eng.user.20140509.125022:user/release-keys Sony Xperia X F5121 (8.0.0):Sony:F5121=Sony/F5121/F5121:8.0.0/34.4.A.2.118/1631208121:user/release-keys__2018-09-01 Sony Xperia X Compact F5321 (8.0.0):Sony:F5321=Sony/F5321/F5321:8.0.0/34.4.A.2.118/1631208121:user/release-keys__2018-09-01 @@ -304,9 +305,9 @@ Xiaomi Mi 9T European (9 & 10):Xiaomi:Mi 9T=Xiaomi/davinci_eea/davinci:9/PKQ1.19 Xiaomi Mi 9T Global (10):Xiaomi:Mi 9T=Xiaomi/davinci/davinci:10/QKQ1.190825.002/V11.0.1.0.QFJMIXM:user/release-keys__2019-12-01 Xiaomi Mi 9T Pro (9 & 10):Xiaomi:Mi 9T Pro=Xiaomi/raphael/raphael:9/PKQ1.181121.001/V10.3.14.0.PFKCNXM:user/release-keys__2019-06-01;Xiaomi/raphael/raphael:10/QKQ1.190825.002/V11.0.1.0.QFKMIXM:user/release-keys__2019-10-01 Xiaomi MI 10 European (10):Xiaomi:Mi 10=Xiaomi/umi_eea/umi:10/QKQ1.191117.002/V11.0.10.0.QJBEUVF:user/release-keys__2020-07-01 -Xiaomi Mi 10 Global (10):Xiaomi:Mi 10=Xiaomi/umi/umi:10/QKQ1.191117.002/V11.0.15.0.QJBCNXM:user/release-keys__2020-02-01 +Xiaomi Mi 10 Global (10 & 11):Xiaomi:Mi 10=Xiaomi/umi/umi:10/QKQ1.191117.002/V11.0.15.0.QJBCNXM:user/release-keys__2020-02-01;Xiaomi/umi/umi:11/RKQ1.200710.002/V12.1.3.0.RJBCNXM:user/release-keys__2020-09-01 Xiaomi Mi 10 Lite 5G (10):Xiaomi:M2002J9G=Xiaomi/monet_eea/monet:10/QKQ1.191222.002/V12.0.1.0.QJIEUXM:user/release-keys__2020-06-01 -Xiaomi Mi 10 Pro (10):Xiaomi:Mi 10 Pro=Xiaomi/cmi/cmi:10/QKQ1.191117.002/V12.0.4.0.QJACNXM:user/release-keys__2020-07-01 +Xiaomi Mi 10 Pro (10 & 11):Xiaomi:Mi 10 Pro=Xiaomi/cmi/cmi:10/QKQ1.191117.002/V12.0.4.0.QJACNXM:user/release-keys__2020-07-01;Xiaomi/cmi/cmi:11/RKQ1.200710.002/V12.1.2.0.RJACNXM:user/release-keys__2020-09-01 Xiaomi Mi A1 (7.1.2 & 8.0.0 & 8.1.0 & 9):Xiaomi:Mi A1=xiaomi/tissot/tissot_sprout:7.1.2/N2G47H/7.12.19:user/release-keys;xiaomi/tissot/tissot_sprout:8.0.0/OPR1.170623.026/V.9.5.10.0.ODHMIFA:user/release-keys__2018-04-01;xiaomi/tissot/tissot_sprout:8.1.0/OPM1.171019.026/V9.6.8.0.ODHMIFE:user/release-keys__2018-11-01;xiaomi/tissot/tissot_sprout:9/PKQ1.180917.001/V10.0.24.0.PDHMIXM:user/release-keys__2020-08-01 Xiaomi Mi A2 (8.1.0 & 9 & 10):Xiaomi:Mi A2=xiaomi/jasmine/jasmine_sprout:8.1.0/OPM1.171019.011/V9.6.17.0.ODIMIFE:user/release-keys__2018-11-05;xiaomi/jasmine/jasmine_sprout:9/PKQ1.180904.001/V10.0.18.0.PDIMIXM:user/release-keys__2019-12-05;xiaomi/jasmine/jasmine_sprout:10/QKQ1.190910.002/V11.0.13.0.QDIMIXM:user/release-keys__2020-08-05 Xiaomi Mi A2 Lite (8.1.0 & 9 & 10):Xiaomi:Mi A2 Lite=xiaomi/daisy/daisy_sprout:8.1.0/OPM1.171019.019/V9.6.11.0.ODLMIFF:user/release-keys__2018-11-01;xiaomi/daisy/daisy_sprout:9/PKQ1.180917.001/V10.0.20.0.PDLMIXM:user/release-keys__2020-03-01;xiaomi/daisy/daisy_sprout:10/QKQ1.191002.002/V11.0.9.0.QDLMIXM:user/release-keys__2020-07-01 @@ -323,7 +324,7 @@ Xiaomi Mi Note 3 (8.1.0):Xiaomi:Mi Note 3=Xiaomi/jason/jason:8.1.0/OPM1.171019.0 Xiaomi Mi Note 10 European (9):Xiaomi:Mi Note 10=Xiaomi/tucana_eea/tucana:9/PKQ1.190302.001/V11.0.11.0.PFDEUXM:user/release-keys__2019-11-01 Xiaomi Mi Pad (4.4.4):Xiaomi:MI PAD=Xiaomi/mocha/mocha:4.4.4/KTU84P/V7.5.2.0.KXFMIDE:user/release-keys Xiaomi Mi Pad 4 (8.1.0):Xiaomi:MI PAD 4=Xiaomi/clover/clover:8.1.0/OPM1.171019.019/V10.1.1.0.ODJCNFI:user/release-keys__2018-10-01 -Xiaomi Pocophone F1 (9 & 10):Xiaomi:POCOPHONE F1=Xiaomi/beryllium/beryllium:9/PKQ1.180729.001/V11.0.5.0.PEJMIXM:user/release-keys__2019-10-01;Xiaomi/beryllium/beryllium:10/QKQ1.190828.002/V11.0.9.0.QEJMIXM:user/release-keys__2020-06-01 +Xiaomi Pocophone F1 (9 & 10):Xiaomi:POCOPHONE F1=Xiaomi/beryllium/beryllium:9/PKQ1.180729.001/V11.0.5.0.PEJMIXM:user/release-keys__2019-10-01;Xiaomi/beryllium/beryllium:10/QKQ1.190828.002/V12.0.1.0.QEJMIXM:user/release-keys__2020-08-01 Xiaomi Redmi 3/3 Pro (5.1.1):Xiaomi:Redmi 3=Xiaomi/ido/ido:5.1.1/LMY47V/V9.6.2.0.LAIMIFD:user/release-keys Xiaomi Redmi 3S/X Prime (6.0.1):Xiaomi:Redmi 3S=Xiaomi/land/land:6.0.1/MMB29M/V9.5.1.0.MALMIFA:user/release-keys Xiaomi Redmi 4 Pro (6.0.1):Xiaomi:Redmi 4=Xiaomi/markw/markw:6.0.1/MMB29M/V9.5.3.0.MBEMIFA:user/release-keys diff --git a/common/propsconf_conf b/common/propsconf_conf index f5bcf65..0e3a760 100644 --- a/common/propsconf_conf +++ b/common/propsconf_conf @@ -9,7 +9,7 @@ # ================================================================= # Required module version (or newer). Do not edit this value! -CONFTRANSF=531 +CONFTRANSF=534 # Device fingerprint CONFFINGERPRINT="" @@ -58,7 +58,8 @@ DELPROPOPTION=replace # Module settings CONFBOOT=default CONFCOLOUR=true -CONFWEB=true +CONFWEBP=true +CONFWEBU=true CONFUPDATE=true CONFBACK=false @@ -195,7 +196,7 @@ CONFBACK=false # 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, CONFWEB, CONFUPDATE and CONFBACK are the options for scrit colours, -# automatic fingerprints list update, automatic update of the set fingerprint and +# CONFCOLOUR, CONFWEBP, CONFWEBP, CONFUPDATE and CONFBACK are the options for scrit colours, +# automatic fingerprints list update, moduel update check, automatic update of the set fingerprint and # background execution of the post-fs-data.sh boot script. # See the module documentation for more details. Set to "true" or "false". diff --git a/common/propsconf_late b/common/propsconf_late index 120e78d..0ab6f89 100644 --- a/common/propsconf_late +++ b/common/propsconf_late @@ -8,7 +8,7 @@ # In that case, feel free to delete it. # Script version -SCRIPTV=35 +SCRIPTV=36 SETTRANSF=3 NOTTRANSF="BRANDSET;NAMESET;DEVICESET;RELEASESET;IDSET;INCREMENTALSET;SDKSET" @@ -53,7 +53,8 @@ SIMSTAGE=0 # Script settings OPTIONBOOT=0 OPTIONCOLOUR=1 -OPTIONWEB=1 +OPTIONWEBP=1 +OPTIONWEBU=1 OPTIONUPDATE=1 OPTIONBACK=0 diff --git a/common/util_functions.sh b/common/util_functions.sh index d8718a3..208d638 100644 --- a/common/util_functions.sh +++ b/common/util_functions.sh @@ -40,8 +40,6 @@ get_file_value() { # ======================== Variables ======================== MODULESPATH=$ADBPATH/modules LATEFILE=$MHPCPATH/propsconf_late -MIRRORLOC=/sbin/.magisk/mirror/system -VENDLOC=/sbin/.magisk/mirror/vendor if [ -z $SLOT ]; then CACHELOC=/cache else @@ -81,7 +79,8 @@ if [ "$INSTFN" ]; then SIMSTAGE OPTIONBOOT OPTIONCOLOUR - OPTIONWEB + OPTIONWEBP + OPTIONWEBU OPTIONUPDATE OPTIONBACK BRANDSET @@ -141,15 +140,15 @@ else " fi -COREPATH=/sbin/.magisk -MIRRORPATH=$COREPATH/mirror +TMPFSMOUNT=$(magisk --path) +MIRRORPATH=$TMPFSMOUNT/.magisk/mirror SYSTEMFILE=$MODPATH/system.prop RUNFILE=$MHPCPATH/script_check +UPDATECHECK="" # Make sure that the terminal app used actually can see resetprop if [ "$BOOTSTAGE" == "props" ]; then alias resetprop="$ADBPATH/magisk/magisk resetprop" fi -alias reboot="/system/bin/reboot" # Fingerprint variables PRINTSLOC=$MODPATH/common/prints.sh @@ -183,6 +182,17 @@ $CACHELOC /data/media/0 " +# Solo-run run options +SOLORUN=" +d +f +h +l +r +s +u +" + # MagiskHide props PROPSLIST=" ro.debuggable @@ -211,6 +221,7 @@ system vendor product odm +system_ext " # Additional fingerprint prop parts @@ -425,10 +436,14 @@ format_file() { # Reboot the device force_reboot() { + RBREASON="" + if [ "$(get_file_value "$TMPFSMOUNT/.magisk/config" "RECOVERYMODE=")" == "true" ]; then + RBREASON="recovery" + fi echo "" echo -e "${C}Rebooting...${N}" log_handler "Rebooting." - [ $(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 + [ $(getprop sys.boot_completed) == 1 ] && /system/bin/svc power reboot $RBREASON >> $LOGFILE 2>&1 || /system/bin/reboot $RBREASON >> $LOGFILE 2>&1 || setprop sys.powerctl reboot >> $LOGFILE 2>&1 sleep 15 log_handler "Rebooting failed." echo "" @@ -826,13 +841,21 @@ config_file() { replace_fn OPTIONCOLOUR $OPTIONCOLOUR $OPTCCHNG $LATEFILE log_handler "Colour is set to $CONFCOLOUR." # Fingerprints list update - if [ "$CONFWEB" == "true" ]; then + if [ "$CONFWEBP" == "true" ]; then OPTWCHNG=1 else OPTWCHNG=0 fi - replace_fn OPTIONWEB $OPTIONWEB $OPTWCHNG $LATEFILE - log_handler "Automatic fingerprints list update is set to $CONFWEB." + replace_fn OPTIONWEBP $OPTIONWEBP $OPTWCHNG $LATEFILE + log_handler "Automatic fingerprints list update is set to $CONFWEBP." + # Module update check + if [ "$CONFWEBU" == "true" ]; then + OPTWCHNG=1 + else + OPTWCHNG=0 + fi + replace_fn OPTIONWEBU $OPTIONWEBU $OPTWCHNG $LATEFILE + log_handler "Module update check at start is set to $CONFWEBU." # Automatic fingerprints update if [ "$CONFUPDATE" == "true" ]; then OPTFCHNG=1 @@ -864,7 +887,59 @@ config_file() { # Connection test test_connection() { - ping -c 1 -W 1 google.com >> $LOGFILE 2>&1 && CNTTEST="true" || CNTTEST="false" + case $1 in + *nw*) # Don't run if the -nw run option is used. + ;; + *) + log_handler "Checking connection." + ping -c 1 -W 1 google.com >> $LOGFILE 2>&1 && CNTTEST="true" || CNTTEST="false" + ;; + esac +} + +# Module update check +update_check() { + case $2 in + *nw*) # Don't run if the -nw run option is used. + ;; + *) + if [ "$1" == "manual" ]; then + # Testing connection + test_connection + fi + if [ "$CNTTEST" == "true" ]; then + echo "" + log_print "Checking for module update." + MODPROPTMP=$MHPCPATH/module.prop + MODPROPWWW="https://raw.githubusercontent.com/Magisk-Modules-Repo/MagiskHidePropsConf/master/module.prop" + MODVERTMP="$(echo $(get_file_value $MODPROPTMP "version=") | sed 's|-.*||' | sed 's|v||' | sed 's|\.||g')" + module_v_ctrl + wget -T 5 -q -O $MODPROPTMP $MODPROPWWW >> $LOGFILE 2>&1 + if [ -s "$MODPROPTMP" ]; then + if [ "$VERSIONCMP" -lt "$MODVERTMP" ]; then + UPDATECHECK="There is a newer version of the module\navailable. Please update." + log_print "Module update available." + else + if [ "$1" == "manual" ]; then + UPDATECHECK="No update available." + else + UPDATECHECK="" + fi + log_print "No update available." + fi + elif [ -f "$MODPROPTMP" ]; then + rm -f $MODPROPTMP + log_print "! File not downloaded!" + log_handler "File is empty." + else + log_print "! File not downloaded!" + fi + else + log_handler "No connection." + fi + sleep 0.5 + ;; + esac } # system.prop creation @@ -889,6 +964,14 @@ system_prop() { fi # Check system.prop content system_prop_cont + + # Check for edge case where module has been updated but no reboot has been done yet + if [ -d "$ADBPATH/modules_update/MagiskHidePropsConf" ] && [ -f "$MODPATH/system.prop" ]; then + log_handler "Copying system.prop to update folder." + cp -f $MODPATH/system.prop $ADBPATH/modules_update/MagiskHidePropsConf >> $LOGFILE 2>&1 + else + rm -f $ADBPATH/modules_update/MagiskHidePropsConf/system.prop >> $LOGFILE 2>&1 + fi fi } @@ -1046,7 +1129,7 @@ usnf_check() { # Check for bin/xbin bin_check() { - $BOOTMODE && BINCHECK=$COREPATH/mirror/system/xbin || BINCHECK=/system/xbin + $BOOTMODE && BINCHECK=$MIRRORPATH/system/xbin || BINCHECK=/system/xbin if [ -d "$BINCHECK" ]; then BIN=xbin else @@ -1321,61 +1404,65 @@ device_print_update() { # Checks and updates the prints list, $1=run option download_prints() { - # Don't clear screen if running through adb or if testing flag is used - if [ -z "$ANDROID_SOCKET_adbd" ] && [ "$DEVTESTING" == "false" ]; then - clear - fi - if [ "$1" == "Dev" ]; then - PRINTSWWW=$PRINTSDEV - fi - menu_header "Updating fingerprints list" - echo "" - # Testing connection - log_print "Checking connection." - test_connection - # Checking and downloading fingerprints list - if [ "$CNTTEST" == "true" ]; then - log_print "Checking list version." - wget -T 5 -q -O $PRINTSTMP $PRINTSWWW >> $LOGFILE 2>&1 - if [ -s "$PRINTSTMP" ]; then - LISTVERSION=$(get_file_value $PRINTSTMP "PRINTSV=") - if [ "$LISTVERSION" ]; then - if [ "$LISTVERSION" == "Dev" ] || [ "$1" == "f" -a "$(get_file_value $PRINTSLOC "PRINTSV=")" == "Dev" ] || [ "$LISTVERSION" -gt "$(get_file_value $PRINTSLOC "PRINTSV=")" ]; then - module_v_ctrl - if [ "$(get_file_value $PRINTSTMP "PRINTSTRANSF=")" -le $VERSIONCMP ]; then - mv -f $PRINTSTMP $PRINTSLOC >> $LOGFILE 2>&1 - # Updates list version in module.prop - replace_fn version $VERSIONTMP "${MODVERSION}-v${LISTVERSION}" $MODPATH/module.prop - log_print "Updated list to v${LISTVERSION}." - print_files + case $2 in + *nw*) # Don't run if the -nw run option is used. + ;; + *) + if [ "$1" == "Dev" ]; then + PRINTSWWW=$PRINTSDEV + fi + menu_header "Updating fingerprints list" + echo "" + if [ "$1" == "manual" ]; then + # Testing connection + test_connection + fi + # Checking and downloading fingerprints list + if [ "$CNTTEST" == "true" ]; then + echo "" + log_print "Checking list version." + wget -T 5 -q -O $PRINTSTMP $PRINTSWWW >> $LOGFILE 2>&1 + if [ -s "$PRINTSTMP" ]; then + LISTVERSION=$(get_file_value $PRINTSTMP "PRINTSV=") + if [ "$LISTVERSION" ]; then + if [ "$LISTVERSION" == "Dev" ] || [ "$1" == "f" -a "$(get_file_value $PRINTSLOC "PRINTSV=")" == "Dev" ] || [ "$LISTVERSION" -gt "$(get_file_value $PRINTSLOC "PRINTSV=")" ]; then + module_v_ctrl + if [ "$(get_file_value $PRINTSTMP "PRINTSTRANSF=")" -le $VERSIONCMP ]; then + mv -f $PRINTSTMP $PRINTSLOC >> $LOGFILE 2>&1 + # Updates list version in module.prop + replace_fn version $VERSIONTMP "${MODVERSION}-v${LISTVERSION}" $MODPATH/module.prop + log_print "Updated list to v${LISTVERSION}." + print_files + else + rm -f $PRINTSTMP + log_print "New fingerprints list requires module update." + fi + else + rm -f $PRINTSTMP + log_print "Fingerprints list up-to-date." + fi else rm -f $PRINTSTMP - log_print "New fingerprints list requires module update." + log_print "! File not downloaded!" + log_handler "Couldn't extract list version." fi - else + elif [ -f "$PRINTSTMP" ]; then rm -f $PRINTSTMP - log_print "Fingerprints list up-to-date." + log_print "! File not downloaded!" + log_handler "File is empty." + else + log_print "! File not downloaded!" fi else - rm -f $PRINTSTMP - log_print "! File not downloaded!" - log_handler "Couldn't extract list version." + log_print "No connection." fi - elif [ -f "$PRINTSTMP" ]; then - rm -f $PRINTSTMP - log_print "! File not downloaded!" - log_handler "File is empty." - else - log_print "! File not downloaded!" - fi - else - log_print "No connection." - fi - if [ "$1" == "manual" ]; then - sleep 2 - else - sleep 0.5 - fi + if [ "$1" == "manual" ]; then + sleep 2 + else + sleep 0.5 + fi + ;; + esac } # Reset the module fingerprint change, $1=prop name, $2=run option @@ -2169,7 +2256,8 @@ export_settings() { # Module settings replace_fn CONFBOOT default $([ $OPTIONBOOT == 0 ] && echo "default" || $([ $PRINTSTAGE == 1 ] && echo "post" || echo "late")) $EXPORTFILE replace_fn CONFCOLOUR true $([ $OPTIONCOLOUR == 0 ] && echo "false" || echo "true") $EXPORTFILE - replace_fn CONFWEB true $([ $OPTIONWEB == 0 ] && echo "false" || echo "true") $EXPORTFILE + replace_fn CONFWEBP true $([ $OPTIONWEBP == 0 ] && echo "false" || echo "true") $EXPORTFILE + replace_fn CONFWEBU true $([ $OPTIONWEBU == 0 ] && echo "false" || echo "true") $EXPORTFILE replace_fn CONFUPDATE true $([ $OPTIONUPDATE == 0 ] && echo "false" || echo "true") $EXPORTFILE replace_fn CONFBACK false $([ $OPTIONBACK == 0 ] && echo "false" || echo "true") $EXPORTFILE log_handler "Export done." diff --git a/module.prop b/module.prop index a2d48dc..c8f4099 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=MagiskHidePropsConf name=MagiskHide Props Config -version=v5.3.3-v101 -versionCode=64 +version=v5.3.4-v102 +versionCode=65 author=Didgeridoohan description=Change your device's fingerprint, and/or force basic attestation, 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. diff --git a/system/binpath/props b/system/binpath/props index c0511ed..53cba5b 100644 Binary files a/system/binpath/props and b/system/binpath/props differ