Update CommonInstaller, data/build-package.database, data/build-package.pkg-microg, data/build-package.update, Full/system/etc/default-permissions/microg-permissions.xml files

CommonInstaller

@@ -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

Full/system/etc/default-permissions/microg-permissions.xml

@@ -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>

data/build-package.database

@@ -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

data/build-package.pkg-microg

@@ -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
 

data/build-package.update

@@ -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[@]}
 }