rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix backup group

Browse Source
This commit is contained in:
J-Jamet
2020-08-31 21:45:39 +02:00
parent 9aaf72726e
commit f7bbd295d6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt
View File

@@ -40,7 +40,7 @@ import kotlin.collections.ArrayList
class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() { class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
var backupGroupId: Int = BACKUP_FOLDER_UNDEFINED_ID private var backupGroupId: Int = BACKUP_FOLDER_UNDEFINED_ID
private var kdfListV3: MutableList<KdfEngine> = ArrayList() private var kdfListV3: MutableList<KdfEngine> = ArrayList()
@@ -59,7 +59,14 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
// Retrieve backup group in index // Retrieve backup group in index
val backupGroup: GroupKDB? val backupGroup: GroupKDB?
get() = if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID) null else getGroupById(backupGroupId) get() {
if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID)
ensureRecycleBinExists()
return if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID)
null
else
getGroupById(backupGroupId)
}
override val kdfEngine: KdfEngine? override val kdfEngine: KdfEngine?
get() = kdfListV3[0] get() = kdfListV3[0]
@@ -222,6 +229,8 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
* @return true if node can be recycle, false elsewhere * @return true if node can be recycle, false elsewhere
*/ */
fun canRecycle(node: NodeVersioned<*, GroupKDB, EntryKDB>): Boolean { fun canRecycle(node: NodeVersioned<*, GroupKDB, EntryKDB>): Boolean {
if (node == backupGroup)
return false
backupGroup?.let { backupGroup?.let {
if (node.isContainedIn(it)) if (node.isContainedIn(it))
return false return false