Full, F-Droid package: allow installing official and Aurora F-Droid clients alongside

ChangeLog.md

@@ -43,6 +43,11 @@
 * Full, microG package
   * use own DroidGuard instead of Official, as long as there's no release
 
+* Full, F-Droid package
+  * allow installing official and Aurora F-Droid clients alongside
+     * use `nanodroid_fdroid=3` to do so
+     * installs F-Droid priviledged extension and Aurora Services alongside
+
 * Patcher
   * Patching through Magisk Manager is possible (atleast 19.0 required, 20.4 highly recommended)
      * please note that you will get an insane amount of messages while flashing

CommonInstaller

@@ -1112,24 +1112,35 @@ install_gsync () {
 	fi
 }
 
+install_fdroid_aurora () {
+	ui_print " << with Aurora Droid"
+	nanodroid_install_apk AuroraDroid
+	nanodroid_install_apk AuroraServices
+	create_privapp_permissions_whitelist AuroraServices
+}
+
+install_fdroid_fdroid () {
+	ui_print " << with F-Droid"
+	nanodroid_install_apk FDroid
+	nanodroid_install_apk FDroidPrivileged
+
+	${NANODROID_BINDIR}/nanodroid-overlay --add FDroidPriv
+
+	create_privapp_permissions_whitelist FDroidPrivileged
+	nanodroid_install_file etc/org.fdroid.fdroid/additional_repos.xml
+}
+
 install_fdroid () {
 	# install F-Droid if requested
 	# respectively force if it's the F-Droid package
 
-	if [ "${nanodroid_fdroid}" -eq 2 ]; then
-		ui_print " << with Aurora Droid"
-		nanodroid_install_apk AuroraDroid
-		nanodroid_install_apk AuroraServices
-		create_privapp_permissions_whitelist AuroraServices
+	if [ "${nanodroid_fdroid" -eq 3 ]; then
+		install_fdroid_fdroid
+		install_fdroid_aurora
+	elif [ "${nanodroid_fdroid}" -eq 2 ]; then
+		install_fdroid_aurora
 	elif [ "${nanodroid_fdroid}" -eq 1 -o "${MODID}" = "NanoDroid_FDroid" ]; then
-		ui_print " << with F-Droid"
-		nanodroid_install_apk FDroid
-		nanodroid_install_apk FDroidPrivileged
-
-		${NANODROID_BINDIR}/nanodroid-overlay --add FDroidPriv
-
-		create_privapp_permissions_whitelist FDroidPrivileged
-		nanodroid_install_file etc/org.fdroid.fdroid/additional_repos.xml
+		install_fdroid_fdroid
 	else	ui_print " << without F-Droid"
 	fi
 }

SetupWizard/META-INF/com/google/android/aroma-config

@@ -89,7 +89,8 @@ selectbox(
 	"Select whether to install F-Droid", "", 2, #-- Group 1. key = "selected.1"
 	"None",		"Don't install F-Droid (does not effect NanoDroid-FDroid)",	0,	#-- selected.1 = 1
 	"Official",	"Install official F-Droid client",				0,	#-- selected.1 = 2
-	"Aurora Droid",	"Install unofficial Aurora Droid client",			1	#-- selected.1 = 3
+	"Aurora Droid",	"Install unofficial Aurora Droid client",			1,	#-- selected.1 = 3
+	"Both",		"Install both official and Aurora F-Droid client",		0	#-- selected.1 = 4
 );
 
 selectbox(

SetupWizard/nanodroid-setup

@@ -171,6 +171,9 @@ elif grep -q "selected.1=2" "${fd_prop}"; then
 elif grep -q "selected.1=3" "${fd_prop}"; then
 	ui_print "  <>> setting property: nanodroid_fdroid [Aurora Droid]"
 	echo "nanodroid_fdroid=2" >> "${nanodroid_setup}"
+elif grep -q "selected.1=4" "${fd.prop}"; then
+	ui_print "  <>> setting property: nanodroid_fdroid [Official + Aurora Droid]"
+	echo "nanodroid_fdroid=3" >> "${nanodroid_setup}"
 fi
 
 if grep -q "item.1.1=1" "${sync_prop}"; then

doc/AlterInstallation.md

@@ -43,6 +43,7 @@ nanodroid_nlpbackend=1000
 the **F-Droid** (nanodroid_fdroid is always 1) and **Bromite WebView** package supports the following options
 
 ```
+nanodroid_fdroid=1
 nanodroid_forcesystem=0
 ```
 
@@ -76,8 +77,11 @@ whether to provide **F-Droid**
 
 * 0 = don't install F-Droid at all (Note: does not effect NanoDroid-FDroid package)
 * 1 = install official F-Droid client
+  * alongside priviledged extension
 * 2 = install unofficial Aurora F-Droid client
   * alongside Aurora Services addon
+* 3 = install both official and Aurora F-Droid clients
+  * alongside their addons
 
 `nanodroid_apps=[0|1]`