From 2210932fdfa67b1d028f2e17bce7e4a471ee8f07 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Mon, 14 Sep 2020 12:56:38 +0200 Subject: [PATCH] Fix app crash when unlocking database V1 without backup folder #692 --- CHANGELOG | 1 + .../keepass/database/element/database/DatabaseKDB.kt | 9 +++++---- fastlane/metadata/android/en-US/changelogs/40.txt | 1 + fastlane/metadata/android/fr-FR/changelogs/40.txt | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ac3fc5fd2..8d1e9aec6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ KeePassDX(2.8.4) * Fix incomplete attachment deletion #684 + * Fix opening database v1 without backup folder #692 KeePassDX(2.8.3) * Upload attachments diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt index 17d26810a..15be1dda9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt @@ -60,8 +60,6 @@ class DatabaseKDB : DatabaseVersioned() { // Retrieve backup group in index val backupGroup: GroupKDB? get() { - if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID) - ensureBackupExists() return if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID) null else @@ -186,6 +184,9 @@ class DatabaseKDB : DatabaseVersioned() { override fun isInRecycleBin(group: GroupKDB): Boolean { var currentGroup: GroupKDB? = group + if (backupGroup == null) + return false + if (currentGroup == backupGroup) return true @@ -229,6 +230,8 @@ class DatabaseKDB : DatabaseVersioned() { * @return true if node can be recycle, false elsewhere */ fun canRecycle(node: NodeVersioned<*, GroupKDB, EntryKDB>): Boolean { + if (backupGroup == null) + ensureBackupExists() if (node == backupGroup) return false backupGroup?.let { @@ -239,14 +242,12 @@ class DatabaseKDB : DatabaseVersioned() { } fun recycle(group: GroupKDB) { - ensureBackupExists() removeGroupFrom(group, group.parent) addGroupTo(group, backupGroup) group.afterAssignNewParent() } fun recycle(entry: EntryKDB) { - ensureBackupExists() removeEntryFrom(entry, entry.parent) addEntryTo(entry, backupGroup) entry.afterAssignNewParent() diff --git a/fastlane/metadata/android/en-US/changelogs/40.txt b/fastlane/metadata/android/en-US/changelogs/40.txt index e541c15ee..6d606bbfd 100644 --- a/fastlane/metadata/android/en-US/changelogs/40.txt +++ b/fastlane/metadata/android/en-US/changelogs/40.txt @@ -1 +1,2 @@ * Fix incomplete attachment deletion #684 + * Fix opening database v1 without backup folder #692 diff --git a/fastlane/metadata/android/fr-FR/changelogs/40.txt b/fastlane/metadata/android/fr-FR/changelogs/40.txt index 166c69066..5702fe1e8 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/40.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/40.txt @@ -1 +1,2 @@ * Correction de la suppression incomplète des fichiers joints #684 + * Correction de l'ouverture de base de données v1 sans dossier backup #692