improve OsmAnd package

CommonInstaller

@@ -571,7 +571,7 @@ magisk_install_setup () {
 				error "${MODID} can't be installed along side the Full package"
 		;;
 
-		NanoDroid_BromiteWebView )
+		NanoDroid_BromiteWebView | NanoDroid_OsmAnd )
 			true
 		;;
 
@@ -995,10 +995,10 @@ install_bromite_webview () {
 }
 
 install_osmand () {
-	if [ "${nanodroid_osmand}" -eq 1 -o "${MODID}" = "NanoDroid_OsmAnd" ]; then
+	if [ "${MODID}" = "NanoDroid_OsmAnd" ]; then
 		ui_print " << with OsmAnd"
 		nanodroid_install_apk OsmAnd
-	else	ui_print " << without OsmAnd"
+		nanodroid_install_apk OsmAnd_ContourLines
 	fi
 }
 

build-package

@@ -127,6 +127,7 @@ for opt in ${@}; do
 		u-bromite )
 			update_indices
 			update_bromite
+			check_nanodroid
 		;;
 
 		u-osmand )

data/build-package.database

@@ -51,6 +51,7 @@ fd_OPENCAMERA=(fdroid net.sourceforge.opencamera app OpenCamera)
 fd_OPENKEYCHAIN=(fdroid org.sufficientlysecure.keychain app OpenKeyChain)
 fd_OPENVPN=(fdroid de.blinkt.openvpn app OpenVPN)
 fd_OSMAND=(fdroid net.osmand.plus app OsmAnd)
+fd_OSMAND_CONTOURLINES=(fdroid net.osmand.srtmPlugin.paid app OsmAnd_ContourLines)
 fd_QKSMS=(fdroid com.moez.QKSMS app QKSMS)
 fd_SIMPLECALENDAR=(fdroid com.simplemobiletools.calendar app SimpleCalendar)
 fd_SIMPLEGALLERY=(fdroid com.simplemobiletools.gallery.pro app SimpleGallery)
@@ -154,7 +155,6 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/system/app/OpenVPN/OpenVPN.apk
 	Full/system/app/OpenWeatherMapProvider/OpenWeatherMapProvider.apk
 	Full/system/app/Orbot/Orbot.apk
-	Full/system/app/OsmAnd/OsmAnd.apk
 	Full/system/app/QKSMS/QKSMS.apk
 	Full/system/app/SimpleCalendar/SimpleCalendar.apk
 	Full/system/app/SimpleGallery/SimpleGallery.apk
@@ -175,4 +175,6 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/system/priv-app/GmsCore_Official/GmsCore_Official.apk
 	BromiteWebView/system/app/BromiteWebView_arm/BromiteWebView_arm.apk
 	BromiteWebView/system/app/BromiteWebView_arm64/BromiteWebView_arm64.apk
-	BromiteWebView/system/app/BromiteWebView_x86/BromiteWebView_x86.apk )
+	BromiteWebView/system/app/BromiteWebView_x86/BromiteWebView_x86.apk
+	OsmAnd/system/app/OsmAnd/OsmAnd.apk
+	OsmAnd/system/app/OsmAnd_ContourLines/OsmAnd_ContourLines.apk )

data/build-package.download

@@ -84,11 +84,19 @@ grab_apk_from_repo () {
 
 	APK_URL="${REPO}/${APK_NAME}"
 
-	if [ "${1}" = "bromite" ]; then
-		APK_DEST="${CWD}/BromiteWebView/system/${3}/${4}"
-	else
-		APK_DEST="${CWD}/Full/system/${3}/${4}"
-	fi
+	case "${PKG_NAME}" in
+		com.android.webview )
+			APK_DEST="${CWD}/BromiteWebView/system/${3}/${4}"
+		;;
+
+		net.osmand.plus | net.osmand.srtmPlugin.paid )
+			APK_DEST="${CWD}/OsmAnd/system/${3}/${4}"
+		;;
+
+		* )
+			APK_DEST="${CWD}/Full/system/${3}/${4}"
+		;;
+	esac
 
 	if [[ -f "${APK_DEST}/${4}.apk" ]]; then
 		TMP_SUM="$(sha256sum "${APK_DEST}/${4}.apk")"

data/build-package.pkg-osmand

@@ -7,7 +7,6 @@ create_osmand_package() {
 	print_package "OsmAnd"
 
 	cd "${CWD}/Full"
-	zip_add "system/app/OsmAnd/"
 	zip_add "system/xbin/unzip*"
 	cd "${CWD}"
 

data/build-package.update

@@ -70,7 +70,6 @@ update_apps () {
 	grab_apk_from_repo ${fd_OPENKEYCHAIN[@]}
 	grab_apk_from_repo ${nlx_OPENLAUNCHER[@]}
 	grab_apk_from_repo ${fd_OPENVPN[@]}
-	grab_apk_from_repo ${fd_OSMAND[@]}
 	grab_apk_from_repo ${fd_QKSMS[@]}
 	grab_apk_from_repo ${fd_SIMPLECALENDAR[@]}
 	grab_apk_from_repo ${fd_SIMPLEGALLERY[@]}
@@ -99,4 +98,5 @@ update_bromite () {
 
 update_osmand () {
 	grab_apk_from_repo ${fd_OSMAND[@]}
+	grab_apk_from_repo ${fd_OSMAND_CONTOURLINES[@]}
 }

doc/.nanodroid-setup

@@ -8,7 +8,6 @@ nanodroid_zelda=1
 nanodroid_mapsv1=1
 nanodroid_init=1
 nanodroid_gsync=0
-nanodroid_osmand=1
 nanodroid_swipe=0
 nanodroid_forcesystem=0
 nanodroid_nlpbackend=3