From e747d107612ffc7fc348872e5f7cec23412a5393 Mon Sep 17 00:00:00 2001
From: Vladimir Filatov <vavun2@yandex.ru>
Date: Mon, 26 Nov 2018 15:20:08 +0000
Subject: [PATCH] Add Aurora Store and Apple nlp to setupwizard

---
 .../META-INF/com/google/android/aroma-config  | 25 ++++++++++++-------
 setup-wizard/nanodroid-setup                  | 24 +++++++++++++++---
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/setup-wizard/META-INF/com/google/android/aroma-config b/setup-wizard/META-INF/com/google/android/aroma-config
index a876d9b..4119526 100644
--- a/setup-wizard/META-INF/com/google/android/aroma-config
+++ b/setup-wizard/META-INF/com/google/android/aroma-config
@@ -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
 
 );
 
diff --git a/setup-wizard/nanodroid-setup b/setup-wizard/nanodroid-setup
index 099e47b..d7da5b6 100644
--- a/setup-wizard/nanodroid-setup
+++ b/setup-wizard/nanodroid-setup
@@ -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