migrate from Adaway to Blockada

CommonInstaller

@@ -750,14 +750,7 @@ install_apps () {
 		ui_print "${APP_STRING}"
 
 		for app in ${INSTALL_APPS}; do
-			if [[ ${app} = Adaway && -d /system/app/AdAway ]]; then
-				if [ "${nanodroid_override}" -eq 0 ]; then
-					ui_print " <<> app: Adaway already provided by ROM (as AdAway)"
-				else	nanodroid_install_apk Adaway
-					echo "   + removing conflicting AdAway"
-					${NANODROID_BINDIR}/nanodroid-overlay --add AdAway
-				fi
-			elif [[ ${app} = OmniClock && -d /system/app/OmniClockOSS ]]; then
+			if [[ ${app} = OmniClock && -d /system/app/OmniClockOSS ]]; then
 				if [ "${nanodroid_override}" -eq 0 ]; then
 					ui_print " <<> app: OmniClock already provided by ROM (as OmniClockOSS)"
 				else
@@ -1277,6 +1270,11 @@ check_cfg_apps () {
 	if grep -q Orfox "${cfg_apps}"; then
 		sed -e 's/Orfox/TorBrowser/g' -i "${cfg_apps}"
 	fi
+
+	# <= 18.4 has Adaway instead of Blockada, migrate
+	if grep -q Adaway "${Blockada}"; then
+		sed -e 's/Adaway/Blockada/g' -i "${cfg_apps}"
+	fi
 }
 
 # check whether '.nanodroid-overlay' is up to date

data/build-package.database

@@ -35,10 +35,10 @@ fd_FDROID_PE=(fdroid org.fdroid.fdroid.privileged priv-app FDroidPrivileged)
 # Apps
 ###
 
-fd_ADAWAY=(fdroid org.adaway app Adaway)
 fd_AMAZE=(fdroid com.amaze.filemanager app Amaze)
 fd_ANYSOFTKEYBOARD=(fdroid com.menny.android.anysoftkeyboard app AnysoftKeyboard)
 fd_BEHEKEYBOARD=(fdroid com.vlath.keyboard app BeHeKeyboard)
+fd_BLOCKADA=(fdroid org.blokada.alarm app Blockada)
 fd_FACESLIM=(fdroid org.indywidualni.fblite app FaceSlim)
 fd_KEEPASSDX=(fdroid com.kunzisoft.keepass.libre app KeePassDX)
 fd_LIGHTNING=(fdroid acr.browser.lightning app Lightning)
@@ -117,10 +117,10 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/swipe/x86/libjni_latinimegoogle.so
 	Full/swipe/x86_64/libjni_keyboarddecoder.so
 	Full/swipe/x86_64/libjni_latinimegoogle.so
-	Full/system/app/Adaway/Adaway.apk
 	Full/system/app/Amaze/Amaze.apk
 	Full/system/app/AnysoftKeyboard/AnysoftKeyboard.apk
 	Full/system/app/BeHeKeyboard/BeHeKeyboard.apk
+	Full/system/app/Blockada/Blockada.apk
 	Full/system/app/FDroid/FDroid.apk
 	Full/system/app/FaceSlim/FaceSlim.apk
 	Full/system/app/K9Mail/K9Mail.apk

data/build-package.update

@@ -17,19 +17,17 @@ update_swipe () {
 }
 
 update_microg () {
+	grab_apk_from_repo ${nlx_GMSCORE[@]}
 	#grab_apk_from_repo ${uG_GMSCORE[@]}
 	grab_apk_from_repo ${uG_GSFPROXY[@]}
+	grab_apk_from_repo ${nlx_DROIDGUARD[@]}
 	#grab_apk_from_repo ${uG_DROIDGUARD[@]}
 	grab_apk_from_repo ${uG_FAKESTORE[@]}
 	grab_apk_from_repo ${fd_NLPDEJAVU[@]}
 	grab_apk_from_repo ${fd_NLPMOZILLA[@]}
 	grab_apk_from_repo ${fd_NLPNOMINATIM[@]}
 	grab_apk_from_repo ${fd_YALPSTORE[@]}
-
 	grab_apk_from_repo ${nlx_PHONESKY[@]}
-	grab_apk_from_repo ${nlx_DROIDGUARD[@]}
-	grab_apk_from_repo ${nlx_GMSCORE[@]}
-
 }
 
 update_gsync () {
@@ -48,10 +46,10 @@ update_fdroid () {
 
 update_apps () {
 	# applications managed in repositories
-	grab_apk_from_repo ${fd_ADAWAY[@]}
 	#grab_apk_from_repo ${fd_AMAZE[@]}
 	grab_apk_from_repo ${fd_ANYSOFTKEYBOARD[@]}
 	grab_apk_from_repo ${fd_BEHEKEYBOARD[@]}
+	grab_apk_from_repo ${fd_BLOCKADA[@]}
 	grab_apk_from_repo ${fd_FACESLIM[@]}
 	grab_apk_from_repo ${fd_KEEPASSDX[@]}
 	grab_apk_from_repo ${fd_LIGHTNING[@]}
@@ -70,9 +68,6 @@ update_apps () {
 	#grab_apk_from_repo ${gd_ORFOX[@]}
 	grab_apk_from_url ${tp_TORBROWSER[@]}
 
-	# applications not managed in repositories
-	# plain URL
-	grab_apk_from_url ${nlx_MPV[@]}
 	#grab_apk_from_url ${nlx_AMAZE[@]}
 	grab_apk_from_url ${nlx_OMNICLOCK[@]}
 

doc/.nanodroid-apps

@@ -1,7 +1,7 @@
-Adaway
 Amaze
 AnysoftKeyboard
 BeHeKeyboard
+Blockada
 FaceSlim
 K9Mail
 KeePassDX

doc/Applications.md

@@ -7,10 +7,10 @@ The applications provided by NanoDroid will be
 * directly installed as system applications when installed in System Mode
 
 Full list of provided applications
-* Adaway [> F-Droid](https://f-droid.org/packages/org.adaway)
 * Amaze (File Manager) [> F-Droid](https://f-droid.org/packages/com.amaze.filemanager)
 * AnySoftKeyboard [> F-Droid](https://f-droid.org//packages/com.menny.android.anysoftkeyboard)
-* BeHe Keybarod [> F-Droid](https://f-droid.org/packages/com.vlath.keyboard/)
+* BeHe Keyboard [> F-Droid](https://f-droid.org/packages/com.vlath.keyboard/)
+* Blockada [> F-Droid](https://f-droid.org/en/packages/org.blokada.alarm/)
 * (Simple) Calendar [> F-Droid](https://f-droid.org/packages/com.simplemobiletools.calendar)
 * Face Slim (Facebook client) [> F-Droid](https://f-droid.org/packages/org.indywidualni.fblite)
 * (Simple) Gallery [> F-Droid](https://f-droid.org/packages/com.simplemobiletools.gallery)