update SetupWizard

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

@@ -104,22 +104,16 @@ selectbox(
 	"Official",	"official microG GmsCore",					0	#-- selected.1 = 2
 );
 
-selectbox(
+checkbox(
 	"nlpBackends",
 	"nlpBackends",
 	"icons/update",
 	"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
-	"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
-
+	"Select the location backends for microG", "", 2, #-- Group 1
+	"Déjà Vu",	"Install Déjà Vu backend",		1,
+	"Ichnaea",	"Install Mozilla backend",		0,
+	"Apple",	"Install Apple backend",		0
 );
 
 selectbox(

setup-wizard/nanodroid-setup

@@ -122,32 +122,23 @@ elif grep -q "selected.1=7" "${store_prop}"; then
 	echo "nanodroid_play=6" >> "${nanodroid_setup}"
 fi
 
-if grep -q "selected.1=1" "${nlp_prop}"; then
-	ui_print "  <>> setting property: nanodroid_nlpbackend [None]"
-	echo "nanodroid_nlpbackend=0" >> "${nanodroid_setup}"
-elif grep -q "selected.1=2" "${nlp_prop}"; then
-	ui_print "  <>> setting property: nanodroid_nlpbackend [Déjà Vu]"
-	echo "nanodroid_nlpbackend=1" >> "${nanodroid_setup}"
-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 [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}"
+if grep -q "item.1.1=1" "${nlp_prop}"; then
+	nlp_Dejavu=1
+else	nlp_Dejavu=0
 fi
 
+if grep -q "item.1.2=1" "${nlp_prop}"; then
+	nlp_Ichnaea=1
+else	nlp_Ichnaea=0
+fi
+
+if grep -q "item.1.3=1" "${nlp_prop}"; then
+	nlp_Apple=1
+else	nlp_Apple=0
+fi
+
+echo "nanodroid_nlpabckend=(${nlp_Dejavu} ${nlp_Ichnaea} ${nlp_Apple})" >> "${nanodroid_setup}"
+
 if grep -q "selected.1=1" "${ug_prop}"; then
 	ui_print "  <>> setting property: nanodroid_microg [None]"
 	echo "nanodroid_microg=0" >> "${nanodroid_setup}"