replace Lightning with Privacy Browser

ChangeLog.md

@@ -7,6 +7,9 @@
 * This release replaces `OmniClock` with `Alarmio`
   * if you previously opted-in for OmniClock you'll be auto-migrated to Alarmio
 
+* This release replaces `Lightning` with `Privacy Browser`
+  * if you previously opted-in for Lightning you'll be auto-migrated to Privacy Browser
+
 * This release drops `OpenWeatherMapProvider`
   * check your ROM for supported Weather Providers
 

CommonInstaller

@@ -1661,6 +1661,9 @@ check_cfg_apps () {
 	if grep -q OpenWeatherMapProvider "${cfg_apps}"; then
 		sed -e '/OpenWeatherMapProvider/d' -i "${cfg_apps}"
 	fi
+
+	# >= 21.0.90 has Lightning instead of Privacy Browser, migrate
+	grep -q Lightning "${cfg_apps}" && sed -e 's/Lightning/PrivacyBrowser/g' -i "${cfg_apps}"
 }
 
 # check whether '.nanodroid-overlay' is up to date

data/build-package.database

@@ -44,7 +44,6 @@ fd_BLOCKADA=(fdroid org.blokada.alarm app Blokada)
 fd_FACESLIM=(fdroid org.indywidualni.fblite app FaceSlim)
 fd_KEEPASSDX=(fdroid com.kunzisoft.keepass.libre app KeePassDX)
 fd_K9MAIL=(fdroid com.fsck.k9 app K9Mail)
-fd_LIGHTNING=(fdroid acr.browser.lightning app Lightning)
 fd_NEWPIPE=(fdroid org.schabi.newpipe app NewPipe)
 fd_OANDBACKUP=(fdroid dk.jens.backup app Oandbackup)
 fd_ODYSSEY=(fdroid org.gateshipone.odyssey app Odyssey)
@@ -53,6 +52,7 @@ fd_OPENKEYCHAIN=(fdroid org.sufficientlysecure.keychain app OpenKeyChain)
 fd_OPENLAUNCHER=(fdroid com.benny.openlauncher app OpenLauncher)
 fd_OPENVPN=(fdroid de.blinkt.openvpn app OpenVPN)
 fd_OSMAND=(fdroid net.osmand.plus app OsmAnd)
+fd_PRIVACY_BROWSER=(fdroid com.stoutner.privacybrowser.standard app PrivacyBrowser)
 fd_OSMAND_CONTOURLINES=(fdroid net.osmand.srtmPlugin.paid app OsmAnd_ContourLines)
 fd_QKSMS=(fdroid com.moez.QKSMS app QKSMS)
 fd_SIMPLECALENDAR=(fdroid com.simplemobiletools.calendar.pro app SimpleCalendar)
@@ -143,7 +143,6 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/system/app/K9Mail/K9Mail.apk
 	Full/system/app/KeePassDX/KeePassDX.apk
 	Full/system/app/KernelAdiutor/KernelAdiutor.apk
-	Full/system/app/Lightning/Lightning.apk
 	Full/system/app/MPV/MPV.apk
 	Full/system/app/NewPipe/NewPipe.apk
 	Full/system/app/Oandbackup/Oandbackup.apk
@@ -153,6 +152,7 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/system/app/OpenLauncher/OpenLauncher.apk
 	Full/system/app/OpenVPN/OpenVPN.apk
 	Full/system/app/Orbot/Orbot.apk
+	Full/system/app/PrivacyBrowser/PrivacyBrowser.apk
 	Full/system/app/QKSMS/QKSMS.apk
 	Full/system/app/SimpleCalendar/SimpleCalendar.apk
 	Full/system/app/SimpleGallery/SimpleGallery.apk

data/build-package.update

@@ -66,7 +66,6 @@ update_apps () {
 	grab_apk_from_repo ${fd_FACESLIM[@]}
 	grab_apk_from_repo ${fd_KEEPASSDX[@]}
 	grab_apk_from_repo ${fd_K9MAIL[@]}
-	grab_apk_from_repo ${fd_LIGHTNING[@]}
 	grab_apk_from_repo ${nlx_MPV[@]}
 	grab_apk_from_repo ${fd_NEWPIPE[@]}
 	grab_apk_from_repo ${fd_OANDBACKUP[@]}
@@ -75,6 +74,7 @@ update_apps () {
 	grab_apk_from_repo ${fd_OPENKEYCHAIN[@]}
 	grab_apk_from_repo ${fd_OPENLAUNCHER[@]}
 	grab_apk_from_repo ${fd_OPENVPN[@]}
+	grab_apk_from_repo ${fd_PRIVACY_BROWSER[@]}
 	grab_apk_from_repo ${fd_QKSMS[@]}
 	grab_apk_from_repo ${fd_SIMPLECALENDAR[@]}
 	grab_apk_from_repo ${fd_SIMPLEGALLERY[@]}

doc/.nanodroid-apps

@@ -7,7 +7,6 @@ FaceSlim
 K9Mail
 KeePassDX
 KernelAdiutor
-Lightning
 MPV
 NewPipe
 Oandbackup
@@ -17,6 +16,7 @@ OpenKeyChain
 OpenLauncher
 OpenVPN
 Orbot
+PrivacyBrowser
 QKSMS
 SimpleCalendar
 SimpleGallery

doc/Applications.md

@@ -16,7 +16,6 @@ Full list of provided applications
 * K-9 Mail [> F-Droid](https://f-droid.org/packages/com.fsck.k9)
 * Kernel Adiutor [> GitHub](https://github.com/Grarak/KernelAdiutor)
 * KeyPassDX (Password Safe) [> F-Droid](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre)
-* Lightning (Browser) [> F-Droid](https://f-droid.org/packages/acr.browser.lightning)
 * MPV (Video Player) [> GitHub](https://github.com/mpv-android/mpv-android)
 * New Pipe (YouTube client) [> F-Droid](https://f-droid.org/packages/org.schabi.newpipe)
 * Oandbackup (App backup and restore) [> F-Droid](https://f-droid.org/packages/dk.jens.backup)
@@ -26,6 +25,7 @@ Full list of provided applications
 * OpenLauncher [> F-Droid](https://f-droid.org/packages/com.benny.openlauncher)
 * OpenVPN [> F-Droid](https://f-droid.org/packages/de.blinkt.openvpn)
 * Orbot [> Guardian Project](https://guardianproject.info/apps/orbot/)
+* Privacy Browser [> F-Droid](https://f-droid.org/de/packages/com.stoutner.privacybrowser.standard/)
 * QKSMS [> F-Droid](https://f-droid.org/packages/com.moez.QKSMS)
 * Simple Calendar Pro [> F-Droid](https://f-droid.org/packages/com.simplemobiletools.calendar.pro)
 * Simple Gallery Pro [> F-Droid](https://f-droid.org/packages/com.simplemobiletools.gallery.pro)
@@ -47,7 +47,7 @@ on your device, in one of the following directories
 * `/data/media/0` (internal storage)
 * `/external_sd` (TWRP path to SD Card (if any))
 * directory containing the zip file
-* `/data` (fallabck)
+* `/data` (fallback)
 
 All applications listed in that file will be installed. See the [default settings](.nanodroid-apps), which are used when no `.nanodroid-apps` configuration file was found. 
 

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

@@ -132,7 +132,6 @@ checkbox(
 	"K9Mail",			"Powerful Mail client",			1,
 	"KeePassDX",			"Password Safe",			1,
 	"KernelAdiutor",		"Customize Kernel Settings",		1,
-	"Lightning",			"Blazing fast Web Browser",		1,
 	"MPV",				"Video Player",				1,
 	"NewPipe",			"YouTube frontend and downloader",	1,
 	"Oandbackup",			"Backup and Restore Apps",		1,
@@ -143,6 +142,7 @@ checkbox(
 	"OpenVPN",			"Connect to VPNs",			1,
 	"Orbot",			"Connect to The Onion Router (TOR)",	1,
 	"Tor Browser",			"Modified Firefox for TOR",		1,
+	"Privacy Browser",		"Secure, Open Source Browser",		1,
 	"QKSMS",			"Great SMS / MMS messenger",		1,
 	"SimpleCalendar",		"Easy to use Calendar",			1,
 	"SimpleGallery",		"Easy to use Gallery",			1,

setup-wizard/nanodroid-setup

@@ -184,17 +184,17 @@ apps_add 6 FaceSlim
 apps_add 7 K9Mail
 apps_add 8 KeePassDX
 apps_add 9 KernelAdiutor
-apps_add 10 Lightning
-apps_add 11 MPV
-apps_add 12 NewPipe
-apps_add 13 Oandbackup
-apps_add 14 Odyssey
-apps_add 15 OpenCamera
-apps_add 16 OpenKeyChain
-apps_add 17 OpenLauncher
-apps_add 18 OpenVPN
-apps_add 19 Orbot
-apps_add 20 TorBrowser
+apps_add 10 MPV
+apps_add 11 NewPipe
+apps_add 12 Oandbackup
+apps_add 13 Odyssey
+apps_add 14 OpenCamera
+apps_add 15 OpenKeyChain
+apps_add 16 OpenLauncher
+apps_add 17 OpenVPN
+apps_add 18 Orbot
+apps_add 19 TorBrowser
+apps_add 20 PrivacyBrowser
 apps_add 21 QKSMS
 apps_add 22 SimpleCalendar
 apps_add 23 SimpleGallery