migrate from KeePassDroid to KeePassDX

ChangeLog.md

@@ -21,8 +21,15 @@
          * in Magisk Mode they will be pseudo-debloated
          * in System Mode they will be moved to /sdcard/nanodroid_backup
      * also see SetupWizard changes for now more flexible Full and microG package setups
+  * Full package
+     * if the user has KeePassDroid in their list of applications to install, install KeePass DX instead
 * Full package
   * switch from stable to beta build for QKSMS
+  * drop KeePassDroid
+  * include KeePass DX
+     * Material UI
+     * Fingerprint support
+     * Android Oreo Autofill support
 * microG package
   * no longer include GNU Bash
 * SetupWizard
@@ -32,6 +39,7 @@
      * nanodroid_nano=[0|1] whether to install GNU Nano Editor
      * nanodroid_utils=[0|1] whether to install Shell Utilities
      * nanodroid_fonts=[0|1] whether to install NanoDroid-Fonts script and Nintendo Fonts
+  * update for KeePassDroid > KeePass DX transistion
 * Patcher, Uninstaller
   * initial A/B parition scheme support
 * Uninstaller
@@ -97,6 +105,7 @@
   * (Simple) Gallery (3.5.3)
   * QKSMS (3.0-beta6)
   * K-9 Mail (5.502)
+  * KeePass DX (2.5.0.0.beta6)
 * Manual
   * GNU Bash (4.4.19)
   * Play Store (9.2.11)

CommonInstaller

@@ -1097,6 +1097,11 @@ check_cfg_apps () {
 		ui_print " ++ migrating ${cfg_apps} to new format"
 		sed -e 's/^INSTALL_APPS=//;s/\"//g' -i "${cfg_apps}"
 	fi
+
+	# 16.3 has KeePass DX instead of KeePassDroid, migrate
+	if grep -q KeePassDroid "${cfg_apps}"; then
+		sed -e 's/KeePassDroid/KeePassDX/g' -i "${cfg_apps}"
+	fi
 }
 
 # check whether '.nanodroid-overlay' has new format

data/build-package.database

@@ -38,6 +38,7 @@ 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_FACESLIM=(fdroid org.indywidualni.fblite app FaceSlim)
+fd_KEEPASSDX=(fdroid com.kunzisoft.keepass.libre app KeePassDX)
 fd_LIGHTNING=(fdroid acr.browser.lightning app Lightning)
 fd_NEWPIPE=(fdroid org.schabi.newpipe app NewPipe)
 fd_OANDBACKUP=(fdroid dk.jens.backup app Oandbackup)
@@ -55,7 +56,6 @@ gd_ORBOT=(https://guardianproject.info/releases/orbot-latest.apk app Orbot)
 gd_ORFOX=(https://guardianproject.info/releases/Orfox-v1.4-RC-3.apk app Orfox)
 
 gh_K9MAIL=(k9mail/k-9 app K9Mail)
-gh_KEEPASSDROID=(bpellin/keepassdroid app KeePassDroid)
 gh_MPV=(mpv-android/mpv-android app MPV)
 gh_TWIDERE=(TwidereProject/Twidere-Android app Twidere)
 gh_QKSMS=(moezbhatti/qksms app QKSMS)
@@ -109,7 +109,7 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/system/app/FDroid/FDroid.apk
 	Full/system/app/FaceSlim/FaceSlim.apk
 	Full/system/app/K9Mail/K9Mail.apk
-	Full/system/app/KeePassDroid/KeePassDroid.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

data/build-package.update

@@ -53,6 +53,7 @@ update_apps () {
 	grab_apk_from_repo ${fd_ANYSOFTKEYBOARD[@]}
 	grab_apk_from_repo ${fd_BEHEKEYBOARD[@]}
 	grab_apk_from_repo ${fd_FACESLIM[@]}
+	grab_apk_from_repo ${fd_KEEPASSDX[@]}
 	grab_apk_from_repo ${fd_LIGHTNING[@]}
 	grab_apk_from_repo ${fd_NEWPIPE[@]}
 	grab_apk_from_repo ${fd_OANDBACKUP[@]}
@@ -75,7 +76,6 @@ update_apps () {
 
 	# GitHub
 	grab_apk_from_github ${gh_K9MAIL[@]}
-	grab_apk_from_github ${gh_KEEPASSDROID[@]}
 	grab_apk_from_github ${gh_MPV[@]}
 	grab_apk_from_github ${gh_TWIDERE[@]}
 	grab_apk_from_github ${gh_QKSMS[@]}

doc/.nanodroid-apps

@@ -4,7 +4,7 @@ AnysoftKeyboard
 BeHeKeyboard
 FaceSlim
 K9Mail
-KeePassDroid
+KeePassDX
 KernelAdiutor
 Lightning
 MPV

doc/Applications.md

@@ -16,7 +16,7 @@ Full list of provided applications
 * (Simple) Gallery [> F-Droid](https://f-droid.org/packages/com.simplemobiletools.gallery)
 * K-9 Mail [> F-Droid](https://f-droid.org/packages/com.fsck.k9)
 * Kernel Adiutor [> GitHub](https://github.com/Grarak/KernelAdiutor)
-* KeyPassDroid (Password Safe) [> F-Droid](https://f-droid.org/packages/com.android.keepass)
+* 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)

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

@@ -115,7 +115,7 @@ checkbox(
 	"FaceSlim",			"Facebook client",			1,
 	"BeHe Keyboard",		"Full-fletched PC-like Keyboard",	1,
 	"K9Mail",			"Powerful Mail client",			1,
-	"KeePassDroid",			"Password Safe",			1,
+	"KeePassDX",			"Password Safe",			1,
 	"KernelAdiutor",		"Customize Kernel Settings",		1,
 	"Lightning",			"Blazing fast Web Browser",		1,
 	"MPV",				"Video Player",				1,

setup-wizard/nanodroid-setup

@@ -132,7 +132,7 @@ apps_add 3 AnysoftKeyboard
 apps_add 4 FaceSlim
 apps_add 5 BeHeKeyboard
 apps_add 6 K9Mail
-apps_add 7 KeePassDroid
+apps_add 7 KeePassDX
 apps_add 8 KernelAdiutor
 apps_add 9 Lightning
 apps_add 10 MPV