Archives
/
NanoDroid
mirror of https://gitlab.com/Nanolx/NanoDroid
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

drop Yalp Store (no updates since 10/2018)

Browse Source
merge-requests/26/head
Christopher Roy Bratusek 5 years ago
parent 0e0f0db17e
commit 62661ee514
8 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File

19
CommonInstaller
Unescape Escape View File

@ -1024,7 +1024,7 @@ install_store () {
[ "${FAKE_STORE}" -eq 1 ] && STORE_CONFLICT="Phonesky" || STORE_CONFLICT=""
# install Yalp, Aurora or Play Store whichever requested
# install Aurora or Play Store whichever requested
case "${STORE_CHOICE}" in
1 )
# force unselect Fake Store when user has choosen Play Store
@ -1040,12 +1040,6 @@ install_store () {
;;
2 )
ui_print " << with Yalp Store"
nanodroid_install_apk YalpStore
create_privapp_permissions_whitelist YalpStore
;;
3 )
ui_print " << with Aurora Store"
nanodroid_install_apk AuroraStore
nanodroid_install_apk AuroraServices
@ -1641,6 +1635,17 @@ check_cfg_setup () {
set_prop nanodroid_play "${tmp_prop}"
fi
# in NanoDroid 22.5 nanodroid_play has changed
if [ "${nanodroid_play}" -ge 30 ]; then
case "${nanodroid_play}" in
30 ) tmp_prop=20 ;;
31 ) tmp_prop=21 ;;
esac
sed -e '/^nanodroid_play/d' -i "${cfg_setup}"
set_prop nanodroid_play "${tmp_prop}"
fi
if [ "${MODID}" = "NanoDroid" ]; then
[ -z "${nanodroid_overlay}" ] && set_prop nanodroid_overlay 1
else [ -z "${nanodroid_overlay}" ] && set_prop nanodroid_overlay 0

7
README.md
Unescape Escape View File

@ -206,7 +206,6 @@ NanoDroid includes
* alternatively you can install [> Aurora Droid](https://f-droid.org/en/packages/com.aurora.adroid) and it's services extension
* modified Play Store to allow (in-)app-purchases with microG
* this required the Play Store to be modified, see the [> patch](https://gitlab.com/Nanolx/microg-phonesky-iap-support)
* alternatively [> Yalp Store (fork)](https://f-droid.org/en/packages/com.github.kiliakin.yalpstore) can be installed instead
* alternatively [> Aurora Store](https://f-droid.org/en/packages/com.aurora.store) and it's services extension can be installed instead
* custom init scripts
* pseudo-debloat feature (Magisk Mode)
@ -458,9 +457,9 @@ NanoDroid includes microG as follows
* disabled by default
* optional Swipe libraries
* disabled by default
* choose between modified **Play Store** [> APK Mirror](https://www.apkmirror.com/apk/google-inc/google-play-store/), **Yalp Store** [> F-Droid](https://f-droid.org/en/packages/com.github.kiliakin.yalpstore/) or **Aurora Store** [> F-Droid](https://f-droid.org/de/packages/com.dragons.aurora/)
* **Yalp Store** and **Aurora Store** can use system permissions to install packages, so you don't need to enable `Unknown Sources`
* go to **Yalp Store** or **Aurora Store** Settings > Installation Method > `Using system permissions`
* choose between modified **Play Store** [> APK Mirror](https://www.apkmirror.com/apk/google-inc/google-play-store/) or **Aurora Store** [> F-Droid](https://f-droid.org/de/packages/com.dragons.aurora/)
* **Aurora Store** can use system permissions to install packages, so you don't need to enable `Unknown Sources`
* go to **Aurora Store** Settings > Installation Method > `Using system permissions`
* Play Store is modified to allow (in-)app-purchases with microG
* GApps and several location services conflict with microG and unified Nlp. Thus they are removed during NanoDroid installation
* using [> NanoDroid-Overlay](doc/NanoDroidOverlay.md)

2
SetupWizard/META-INF/com/google/android/aroma-config
Unescape Escape View File

@ -108,10 +108,8 @@ selectbox(
"Select the Google App Store you want", "", 2, #-- Group 1. key = "selected.1"
"None", "Install no Google App Store", 0, #-- selected.1 = 1
"Play Store (patched)", "Install patched Play Store with microG (in-)app-purchase support", 0, #-- selected.1 = 2
"Yalp Store", "Install alternative Yalp Store", 0, #-- selected.1 = 3
"Aurora Store", "Install alternative Aurora Store", 0, #-- selected.1 = 4
"Fake Store", "Install Fake Store only", 0, #-- selected.1 = 5
"Yalp + Fake Store", "Install alternative Yalp Store (and Fake Store)", 0, #-- selected.1 = 6
"Aurora + Fake Store", "Install alternative Aurora Store (and Fake Store)", 1 #-- selected.1 = 7
);

12
SetupWizard/nanodroid-setup
Unescape Escape View File

@ -120,20 +120,14 @@ elif grep -q "selected.1=2" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Play Store]"
echo "nanodroid_play=10" >> "${nanodroid_setup}"
elif grep -q "selected.1=3" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Yalp Store]"
ui_print " <>> setting property: nanodroid_play [Aurora Store]"
echo "nanodroid_play=20" >> "${nanodroid_setup}"
elif grep -q "selected.1=4" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Aurora Store]"
echo "nanodroid_play=30" >> "${nanodroid_setup}"
elif grep -q "selected.1=5" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Fake Store]"
echo "nanodroid_play=01" >> "${nanodroid_setup}"
elif grep -q "selected.1=6" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Yalp + Fake Store]"
echo "nanodroid_play=21" >> "${nanodroid_setup}"
elif grep -q "selected.1=7" "${store_prop}"; then
elif grep -q "selected.1=5" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Aurora + Fake Store]"
echo "nanodroid_play=31" >> "${nanodroid_setup}"
echo "nanodroid_play=21" >> "${nanodroid_setup}"
fi
if grep -q "item.1.1=1" "${nlp_prop}"; then

2
data/build-package.database
Unescape Escape View File

@ -20,7 +20,6 @@ fd_NLPMOZILLA=(fdroid org.microg.nlp.backend.ichnaea app nlpBackendIchnaea)
fd_NLPNOMINATIM=(fdroid org.microg.nlp.backend.nominatim app nlpBackendNominatim)
fd_NLPAPPLE=(fdroid org.microg.nlp.backend.apple app nlpBackendApple)
fd_NLPRADIOCELL=(fdroid org.openbmap.unifiedNlp app nlpBackendRadiocell)
fd_YALPSTORE=(fdroid com.github.kiliakin.yalpstore priv-app YalpStore)
fd_AURORASTORE=(fdroid com.aurora.store app AuroraStore)
###
@ -150,7 +149,6 @@ file_database=(
${appsfolder[4]}/GmsCore/GmsCore.apk.gz
${appsfolder[4]}/GsfProxy/GsfProxy.apk.gz
${appsfolder[4]}/Phonesky/Phonesky.apk.gz
${appsfolder[4]}/YalpStore/YalpStore.apk.gz
${appsfolder[5]}/common/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
${appsfolder[5]}/K/app/GoogleContactsSync/GoogleContactsSync.apk.gz

14
data/build-package.update
Unescape Escape View File

@ -20,12 +20,10 @@ update_act[7]='0'
update_act[8]='0'
# AuroraServices
update_act[9]='0'
# Yalp
update_act[10]='0'
# Phonesky
update_act[11]='0'
update_act[10]='0'
# General Apps
update_act[12]='0'
update_act[11]='0'
nanodroid_pull () {
update_microg
@ -75,7 +73,6 @@ update_microg () {
update_act[8]='1'
update_act[9]='1'
update_act[10]='1'
update_act[11]='1'
}
grab_gsync () {
@ -135,7 +132,7 @@ grab_apps () {
}
update_apps () {
update_act[12]='1'
update_act[11]='1'
}
grab_bromite () {
@ -164,10 +161,9 @@ update_master () {
[ "${update_act[9]}" = "1" ] && grab_apk_from_gitlab ${gl_AURORASERVICES[@]}
[ "${update_act[5]}" = "1" ] && grab_apk_from_repo ${fd_FDROID[@]}
[ "${update_act[6]}" = "1" ] && grab_apk_from_repo ${fd_FDROID_PE[@]}
[ "${update_act[10]}" = "1" ] && grab_apk_from_repo ${fd_YALPSTORE[@]}
[ "${update_act[11]}" = "1" ] && grab_apk_from_repo ${nlx_PHONESKY[@]}
[ "${update_act[10]}" = "1" ] && grab_apk_from_repo ${nlx_PHONESKY[@]}
[ "${update_act[3]}" = "1" ] && grab_bromite
[ "${update_act[4]}" = "1" ] && grab_osmand
[ "${update_act[12]}" = "1" ] && grab_apps
[ "${update_act[11]}" = "1" ] && grab_apps
[ "${update_act[2]}" = "1" ] && grab_gsync
}

2
doc/.nanodroid-setup
Unescape Escape View File

@ -1,7 +1,7 @@
nanodroid_microg=1
nanodroid_fdroid=1
nanodroid_apps=1
nanodroid_play=31
nanodroid_play=21
nanodroid_overlay=1
nanodroid_zelda=1
nanodroid_mapsv1=1

7
doc/AlterInstallation.md
Unescape Escape View File

@ -20,7 +20,7 @@ create it manually with the following content for the **full** package
nanodroid_microg=1
nanodroid_fdroid=1
nanodroid_apps=1
nanodroid_play=31
nanodroid_play=21
nanodroid_overlay=1
nanodroid_zelda=1
nanodroid_mapsv1=1
@ -37,7 +37,7 @@ nanodroid_utils=1
the **microG** package supports the following options (nanodroid_microg is always 1)
```
nanodroid_play=10
nanodroid_play=21
nanodroid_overlay=0
nanodroid_mapsv1=1
nanodroid_gsync=0
@ -88,8 +88,7 @@ what app store to use:
* 1st item
* 0 = No App Store
* 1 = Play Store
* 2 = Yalp Store
* 3 = Aurora Store
* 2 = Aurora Store
* alongside Aurora Services addon
* 2nd item
* 0 = without Fake Store

Write Preview
Loading…
Cancel
Save