Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00
Code Issues Projects Releases Wiki Activity

allow side-by-side installation for Play Store and Aurora Store

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2020-03-30 19:52:16 +02:00
parent c04158d118
commit e1a661cda2
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
CommonInstaller
View File

@ -1059,32 +1059,45 @@ install_apps () {
fi fi
} }
install_store_play () {
# force unselect Fake Store when user has choosen Play Store
STORE_CONFLICT="FakeStore"
FAKE_STORE=0
ui_print " << with Play Store"
nanodroid_install_apk Phonesky
create_privapp_permissions_whitelist Phonesky
nanodroid_install_file etc/default-permissions/phonesky-permissions.xml
}
install_store_aurora () {
ui_print " << with Aurora Store"
nanodroid_install_apk AuroraStore
nanodroid_install_apk AuroraServices
create_privapp_permissions_whitelist AuroraServices
}
install_store () { install_store () {
STORE_CHOICE=${nanodroid_play:0:1} STORE_CHOICE=${nanodroid_play:0:1}
FAKE_STORE=${nanodroid_play:1:1} FAKE_STORE=${nanodroid_play:1:1}
[ "${FAKE_STORE}" -eq 1 ] && STORE_CONFLICT="Phonesky" || STORE_CONFLICT="" [ "${FAKE_STORE}" -eq 1 ] && STORE_CONFLICT="Phonesky" || STORE_CONFLICT=""
# install Aurora or Play Store whichever requested # install Aurora and/or Play Store whichever requested
case "${STORE_CHOICE}" in case "${STORE_CHOICE}" in
1 ) 1 )
# force unselect Fake Store when user has choosen Play Store install_store_play
STORE_CONFLICT="FakeStore"
FAKE_STORE=0
ui_print " << with Play Store"
nanodroid_install_apk Phonesky
create_privapp_permissions_whitelist Phonesky
nanodroid_install_file etc/default-permissions/phonesky-permissions.xml
;; ;;
2 ) 2 )
ui_print " << with Aurora Store" install_store_aurora
nanodroid_install_apk AuroraStore ;;
nanodroid_install_apk AuroraServices
create_privapp_permissions_whitelist AuroraServices 3 )
install_store_play
install_store_aurora
;; ;;
* ) * )
@ -1651,14 +1664,9 @@ check_cfg_setup () {
fi fi
# in NanoDroid 22.5 nanodroid_play has changed # in NanoDroid 22.5 nanodroid_play has changed
if [ "${nanodroid_play}" -ge 30 ]; then if [ "${nanodroid_play}" -gt 30 ]; then
case "${nanodroid_play}" in
30 ) tmp_prop=20 ;;
31 ) tmp_prop=21 ;;
esac
sed -e '/^nanodroid_play/d' -i "${cfg_setup}" sed -e '/^nanodroid_play/d' -i "${cfg_setup}"
set_prop nanodroid_play "${tmp_prop}" set_prop nanodroid_play 20
fi fi
if [ "${MODID}" = "NanoDroid" ]; then if [ "${MODID}" = "NanoDroid" ]; then

3
doc/AlterInstallation.md
View File

@ -91,9 +91,12 @@ what app store to use:
* 1 = Play Store * 1 = Play Store
* 2 = Aurora Store * 2 = Aurora Store
* alongside Aurora Services addon * alongside Aurora Services addon
* 3 = Play Store and Aurora Store
* alongside Aurora Services addon
* 2nd item * 2nd item
* 0 = without Fake Store * 0 = without Fake Store
* 1 = with Fake Store * 1 = with Fake Store
* only if Play Store is not going to be installed
`nanodroid_overlay=[0|1]` `nanodroid_overlay=[0|1]`