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

Merge branch 'Microg_2' into 'master'

Browse Source 
Add Apple backend and Aurora Store im microG package

See merge request Nanolx/NanoDroid!10
merge-requests/23/head
Christopher Roy Bratusek 6 years ago
parent 601b71e0ef 002cf4f32b
commit 5593656ccc
7 changed files with 72 additions and 16 deletions
Show Stats Download Patch File Download Diff File

24
CommonInstaller
Unescape Escape View File

@ -694,8 +694,16 @@ install_microg () {
ui_print " << with microG [Déjà Vu, Nominatim]" ;;
2 ) NLPBACKEND="nlpBackendIchnaea"
ui_print " << with microG [Ichnaea, Nominatim]" ;;
3 ) NLPBACKEND="nlpBackendDejavu nlpBackendIchnaea"
3 ) NLPBACKEND="nlpBackendApple"
ui_print " << with microG [Apple, Nominatim]" ;;
4 ) NLPBACKEND="nlpBackendDejavu nlpBackendIchnaea"
ui_print " << with microG [Déjà Vu, Ichnaea, Nominatim]" ;;
5 ) NLPBACKEND="nlpBackendDejavu nlpBackendApple"
ui_print " << with microG [Déjà Vu, Apple, Nominatim]" ;;
6 ) NLPBACKEND="nlpBackendIchnaea nlpBackendApple"
ui_print " << with microG [Ichnaea, Apple, Nominatim]" ;;
7 ) NLPBACKEND="nlpBackendDejavu nlpBackendIchnaea nlpBackendApple"
ui_print " << with microG [Déjà Vu, Ichnaea, Apple, Nominatim]" ;;
esac
for app in ${NLPBACKEND} nlpBackendNominatim; do
@ -825,16 +833,28 @@ install_store () {
;;
3 )
ui_print " << with Aurora Store"
NANODROID_APP_STORE="AuroraStore"
NANODROID_REM_STORE=""
;;
4 )
ui_print " << with Fake Store"
NANODROID_APP_STORE="FakeStore"
NANODROID_REM_STORE="Phonesky"
;;
4 )
5 )
ui_print " << with Yalp Store and Fake Store"
NANODROID_APP_STORE="YalpStore FakeStore"
NANODROID_REM_STORE="Phonesky"
;;
6 )
ui_print " << with Aurora Store and Fake Store"
NANODROID_APP_STORE="AuroraStore FakeStore"
NANODROID_REM_STORE="Phonesky"
;;
esac
if [ ! -z "${NANODROID_APP_STORE}" ]; then

5
Full/system/etc/default-permissions/microg-permissions.xml
Unescape Escape View File

@ -52,4 +52,9 @@
<permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"></permission>
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"></permission>
</exception>
<exception package="org.microg.nlp.backend.apple">
<permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"></permission>
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"></permission>
</exception>
</exceptions>

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

@ -24,7 +24,9 @@ uG_FAKESTORE=(microg com.android.vending priv-app FakeStore)
fd_NLPDEJAVU=(fdroid org.fitchfamily.android.dejavu app nlpBackendDejavu)
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_YALPSTORE=(fdroid com.github.yeriomin.yalpstore priv-app YalpStore)
fd_AURORASTORE=(fdroid com.dragons.aurora priv-app AuroraStore)
###
# F-Droid
@ -164,6 +166,7 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
Full/system/app/Twidere/Twidere.apk
Full/system/app/XDALabs/XDALabs.apk
Full/system/app/YahooWeatherProvider/YahooWeatherProvider.apk
Full/system/app/nlpBackendApple/nlpBackendApple.apk
Full/system/app/nlpBackendIchnaea/nlpBackendIchnaea.apk
Full/system/app/nlpBackendDejavu/nlpBackendDejavu.apk
Full/system/app/nlpBackendNominatim/nlpBackendNominatim.apk
@ -172,6 +175,7 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
Full/system/priv-app/FakeStore/FakeStore.apk
Full/system/priv-app/Phonesky/Phonesky.apk
Full/system/priv-app/YalpStore/YalpStore.apk
Full/system/priv-app/AuroraStore/AuroraStore.apk
Full/system/priv-app/GsfProxy/GsfProxy.apk
Full/system/priv-app/GmsCore_NanoDroid/GmsCore_NanoDroid.apk
Full/system/priv-app/GmsCore_Official/GmsCore_Official.apk

4
data/build-package.pkg-microg
Unescape Escape View File

@ -8,12 +8,12 @@ create_microg_package() {
cd "${CWD}/Full"
for app in DroidGuard nlpBackendDejavu nlpBackendIchnaea nlpBackendNominatim; do
for app in DroidGuard nlpBackendApple nlpBackendDejavu nlpBackendIchnaea nlpBackendNominatim; do
zip_add "system/app/${app}/"
done
for app in FakeStore GmsCore_Official GmsCore_NanoDroid \
Phonesky GsfProxy YalpStore; do
Phonesky GsfProxy YalpStore AuroraStore; do
zip_add "system/priv-app/${app}/"
done

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

@ -35,7 +35,9 @@ update_microg () {
grab_apk_from_repo ${fd_NLPDEJAVU[@]}
grab_apk_from_repo ${fd_NLPMOZILLA[@]}
grab_apk_from_repo ${fd_NLPNOMINATIM[@]}
grab_apk_from_repo ${fd_NLPAPPLE[@]}
grab_apk_from_repo ${fd_YALPSTORE[@]}
grab_apk_from_repo ${fd_AURORASTORE[@]}
grab_apk_from_repo ${nlx_PHONESKY[@]}
}

25
setup-wizard/META-INF/com/google/android/aroma-config
Unescape Escape View File

@ -111,10 +111,15 @@ selectbox(
"nlp.prop",
"Select the location backends for microG", "", 2, #-- Group 1. key = "selected.1"
"None", "Install no nlp backend", 0, #-- selected.1 = 1
"Déjà Vu", "Install Déjà Vu backend", 1, #-- selected.1 = 2
"Ichnaea", "Install Mozilla backend", 0, #-- selected.1 = 3
"Both", "Install both backends", 0 #-- selected.1 = 4
"None", "Install no nlp backend", 0, #-- selected.1 = 1
"Déjà Vu", "Install Déjà Vu backend", 1, #-- selected.1 = 2
"Ichnaea", "Install Mozilla backend", 0, #-- selected.1 = 3
"Apple", "Install Apple backend", 0, #-- selected.1 = 4
"Déjà Vu, Ichnaea", "Install Déjà Vu and Mozilla backend", 0, #-- selected.1 = 5
"Déjà Vu, Apple", "Install Déjà Vu and Apple backend", 0, #-- selected.1 = 6
"Ichnaea, Apple", "Install Mozilla and Apple backends", 0, #-- selected.1 = 7
"Déjà Vu, Ichnaea, Apple", "Install all backends", 0 #-- selected.1 = 8
);
selectbox(
@ -124,11 +129,13 @@ selectbox(
"store.prop",
"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", "Install official Play Store", 1, #-- selected.1 = 2
"Yalp Store", "Install unofficial Yalp Store", 0, #-- selected.1 = 3
"Fake Store", "Install Fake Store only", 0, #-- selected.1 = 4
"Yalp + Fake Store", "Install unofficial Yalp Store (+ Fake Store)", 0 #-- selected.1 = 5
"None", "Install no Google App Store", 0, #-- selected.1 = 1
"Play Store", "Install official Play Store", 1, #-- selected.1 = 2
"Yalp Store", "Install unofficial Yalp Store", 0, #-- selected.1 = 3
"Aurora Store", "Install unofficial Aurora Store", 0, #-- selected.1 = 4
"Fake Store", "Install Fake Store only", 0, #-- selected.1 = 5
"Yalp + Fake Store", "Install unofficial Yalp Store (+ Fake Store)", 0, #-- selected.1 = 6
"Aurora + Fake Store", "Install unofficial Aurora Store (+ Fake Store)", 0 #-- selected.1 = 7
);

24
setup-wizard/nanodroid-setup
Unescape Escape View File

@ -109,11 +109,17 @@ elif grep -q "selected.1=3" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Yalp Store]"
echo "nanodroid_play=2" >> "${nanodroid_setup}"
elif grep -q "selected.1=4" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Fake Store]"
ui_print " <>> setting property: nanodroid_play [Aurora Store]"
echo "nanodroid_play=3" >> "${nanodroid_setup}"
elif grep -q "selected.1=5" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Yalp + Fake Store]"
ui_print " <>> setting property: nanodroid_play [Fake Store]"
echo "nanodroid_play=4" >> "${nanodroid_setup}"
elif grep -q "selected.1=6" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Yalp + Fake Store]"
echo "nanodroid_play=5" >> "${nanodroid_setup}"
elif grep -q "selected.1=7" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Aurora + Fake Store]"
echo "nanodroid_play=6" >> "${nanodroid_setup}"
fi
if grep -q "selected.1=1" "${nlp_prop}"; then
@ -126,8 +132,20 @@ elif grep -q "selected.1=3" "${nlp_prop}"; then
ui_print " <>> setting property: nanodroid_nlpbackend [Ichnaea]"
echo "nanodroid_nlpbackend=2" >> "${nanodroid_setup}"
elif grep -q "selected.1=4" "${nlp_prop}"; then
ui_print " <>> setting property: nanodroid_nlpbackend [Déjà Vu + Ichnaea]"
ui_print " <>> setting property: nanodroid_nlpbackend [Apple]"
echo "nanodroid_nlpbackend=3" >> "${nanodroid_setup}"
elif grep -q "selected.1=5" "${nlp_prop}"; then
ui_print " <>> setting property: nanodroid_nlpbackend [Déjà Vu + Ichnaea]"
echo "nanodroid_nlpbackend=4" >> "${nanodroid_setup}"
elif grep -q "selected.1=6" "${nlp_prop}"; then
ui_print " <>> setting property: nanodroid_nlpbackend [Déjà Vu + Apple]"
echo "nanodroid_nlpbackend=5" >> "${nanodroid_setup}"
elif grep -q "selected.1=7" "${nlp_prop}"; then
ui_print " <>> setting property: nanodroid_nlpbackend [Ichnaea + Apple]"
echo "nanodroid_nlpbackend=6" >> "${nanodroid_setup}"
elif grep -q "selected.1=8" "${nlp_prop}"; then
ui_print " <>> setting property: nanodroid_nlpbackend [Déjà Vu + Ichnaea + Apple]"
echo "nanodroid_nlpbackend=7" >> "${nanodroid_setup}"
fi
if grep -q "selected.1=1" "${ug_prop}"; then

Write Preview
Loading…
Cancel
Save