Merge branch 'master' into 'master'

Minor fixes

See merge request Nanolx/NanoDroid!7

data/build-package.common

@@ -130,6 +130,7 @@ setup NanoDroid [! do this first !]:
 update contents:
 	u-microg		| update microG and companions
 	u-fdroid		| update F-Droid and Extension
+	u-osmand		| update OsmAnd and Plugins
 	u-apps			| update applications
 	u-swipe			| update swipe libraries
 	u-gsync			| update Google Sync Adapters
@@ -142,6 +143,7 @@ create zip files:
 	uninstaller		| create uninstaller zip from repo
 	setupwizard		| create setup-wizard zip from repo
 	bromitewebview		| create Bromite WebView zip from repo
+	osmand		| create OsmAnd package zip from repo
 	all			| create all zips from repo
 
 misc. stuff:

data/build-package.download

@@ -147,7 +147,7 @@ grab_apk_from_url () {
 
 USER_AGENT="Mozilla/5.0 (X11; Linux x86_64; rv:55.0) Gecko/20100101 Firefox/55.0"
 grab_apk_from_apkmirror () {
-	VERSION=$(curl -s https://www.apkmirror.com/apk/${1}/${2}/ | \
+	VERSION=$(curl -s -N https://www.apkmirror.com/apk/${1}/${2}/ | \
 		gawk -F\" '/apk.*release/{print $4 ; exit}' | \
 		sed -e "s,.*${2}-,,g;s,-release/,,g")
 
@@ -155,10 +155,10 @@ grab_apk_from_apkmirror () {
 ${1}/${2}/${2}-${VERSION}-release/\
 ${5}-${VERSION}-android-apk-download"
 
-	URL_WP=$(curl -s "${URL_STRING}/download/" | \
+	URL_WP=$(curl -s -N "${URL_STRING}/download/" | \
 		gawk -F\" '/If not, please click/{print $18}')
 
-	SHA_SUM=$(curl -s "${URL_STRING}/" | \
+	SHA_SUM=$(curl -s -N "${URL_STRING}/" | \
 		grep "SHA-256.*[^>]</span>" | \
 		sed -e 's,.*\">,,;s,</span>,,')
 
@@ -195,8 +195,8 @@ ${5}-${VERSION}-android-apk-download"
 
 
 grab_apk_from_github () {
-	TAG_NAME="$(curl -s https://api.github.com/repos/${1}/releases | gawk -F\" '/tag_name/{print $4; exit}')"
-	APK_NAME="$(curl -s https://api.github.com/repos/${1}/releases | gawk -F\" '/name.*.apk/{print $4; exit}')"
+	TAG_NAME="$(curl -s -N https://api.github.com/repos/${1}/releases | gawk -F\" '/tag_name/{print $4; exit}')"
+	APK_NAME="$(curl -s -N https://api.github.com/repos/${1}/releases | gawk -F\" '/name.*.apk/{print $4; exit}')"
 
 	APK_URL="https://github.com/${1}/releases/download/${TAG_NAME}/${APK_NAME}"
 	APK_DEST="${CWD}/Full/system/${2}/${3}"

data/build-package.update

@@ -7,6 +7,7 @@ nanodroid_pull () {
 	update_swipe
 	update_gsync
 	update_bromite
+	update_osmand
 }
 
 update_swipe () {

setup-wizard/META-INF/com/google/android/aroma-config

@@ -4,6 +4,11 @@ ini_set("rom_author",	"Nanolx");
 ini_set("rom_device",	"Generic (LOS/AOSP)");
 ini_set("rom_date",	"99999999");
 
+# This option should prevent incorrect 
+# and inverted theme and icon colors in some TWRP
+# Need more tests
+# ini_set("force_colorspace","rgba");
+
 anisplash(
     0, "splash/nanolx.png", 1500
 );