From 57c8ebfdc2bf0607441cbe410f39e99c3993e269 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Tue, 20 Nov 2018 18:13:26 +0100
Subject: [PATCH] update SetupWizard

---
 ChangeLog.md                                          |  4 +++-
 setup-wizard/META-INF/com/google/android/aroma-config | 11 +++++++++++
 setup-wizard/nanodroid-setup                          |  9 +++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 212f0b1..4663f56 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -28,7 +28,6 @@
   * new setup variable `nanodroid_gmscore`, selects which microG GmsCore to install
      * 0 = install NanoDroid's [custom microG GmsCore](https://github.com/Nanolx/android_packages_apps_GmsCore)
      * 1 = install [official microG GmsCore](https://github.com/microg/android_packages_apps_GmsCore)
-  
 
 * CommonInstaller
   * NanoDroid installation log now contains whether install was successful or not
@@ -43,6 +42,9 @@
 * Uninstaller
   * now also uninstalls the BromiteWebView package
 
+* SetupWizard
+  * add new `nanodroid_gmscore` variable
+
 * build-package Script
   * move to stable Amaze build
 
diff --git a/setup-wizard/META-INF/com/google/android/aroma-config b/setup-wizard/META-INF/com/google/android/aroma-config
index e78d49f..ad11d79 100644
--- a/setup-wizard/META-INF/com/google/android/aroma-config
+++ b/setup-wizard/META-INF/com/google/android/aroma-config
@@ -88,6 +88,17 @@ selectbox(
 	"Minimal",	"Install microG [GmsCore, Nominatim]",					0	#-- selected.1 = 3
 );
 
+selectbox(
+	"microG GmsCore",
+	"microG GmsCore",
+	"icons/update",
+	"gmscore.prop",
+
+	"Select which microG GmsCore to install (if any)", "", 2, #-- Group 1. key = "selected.1"
+	"NanoDroid",	"custom NanoDroid microG GmsCore with beta state code merged",	1,	#-- selected.1 = 1
+	"Official",	"official microG GmsCore",					0	#-- selected.1 = 2
+);
+
 selectbox(
 	"nlpBackends",
 	"nlpBackends",
diff --git a/setup-wizard/nanodroid-setup b/setup-wizard/nanodroid-setup
index a20be60..798917a 100644
--- a/setup-wizard/nanodroid-setup
+++ b/setup-wizard/nanodroid-setup
@@ -48,6 +48,7 @@ debloat_prop="${aromapath}/debloat.prop"
 location_prop="${aromapath}/location.prop"
 nlp_prop="${aromapath}/nlp.prop"
 ug_prop="${aromapath}/ug.prop"
+gmscore_prop="${aromapath}/gmscore.prop"
 
 ui_print " "
 ui_print "******************************"
@@ -140,6 +141,14 @@ elif grep -q "selected.1=3" "${ug_prop}"; then
 	echo "nanodroid_microg=2" >> "${nanodroid_setup}"
 fi
 
+if grep -q "selected.1=1" "${gmscore_prop}"; then
+	ui_print "  <>> setting property: nanodroid_gmscore [custom]"
+	echo "nanodroid_gmscore=0" >> "${nanodroid_setup}"
+elif grep -q "selected.1=2" "${gmscore_prop}"; then
+	ui_print "  <>> setting property: nanodroid_gmscore [official]"
+	echo "nanodroid_gmscore=1" >> "${nanodroid_setup}"
+fi
+
 ui_print " "
 ui_print "  < Installed Applications"