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

Change containsAttachment method

Browse Source
This commit is contained in:
J-Jamet
2020-08-26 23:35:16 +02:00
parent e987d6647e
commit 6953da4d9a
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
View File

@@ -339,8 +339,7 @@ class NodeAdapter (private val context: Context)
} }
holder.attachmentIcon?.visibility = holder.attachmentIcon?.visibility =
if (entry.getAttachments(mDatabase.binaryPool).isNotEmpty()) if (entry.containsAttachment()) View.VISIBLE else View.GONE
View.VISIBLE else View.GONE
mDatabase.stopManageEntry(entry) mDatabase.stopManageEntry(entry)
} }

6
app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt
View File

@@ -336,9 +336,9 @@ class Entry : Node, EntryVersionedInterface<Group> {
return attachments return attachments
} }
fun containsAttachment(attachment: Attachment, binaryPool: BinaryPool): Boolean { fun containsAttachment(): Boolean {
return entryKDB?.containsAttachment(attachment) == true return entryKDB?.containsAttachment() == true
|| entryKDBX?.containsAttachment(attachment, binaryPool) == true || entryKDBX?.containsAttachment() == true
} }
fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) { fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {

2
app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt
View File

@@ -145,7 +145,7 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
} }
} }
fun containsAttachment(attachment: Attachment): Boolean { fun containsAttachment(): Boolean {
return binaryData != null return binaryData != null
} }

8
app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt
View File

@@ -293,12 +293,8 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
return entryAttachmentList return entryAttachmentList
} }
fun containsAttachment(attachment: Attachment, binaryPool: BinaryPool): Boolean { fun containsAttachment(): Boolean {
for ((_, poolId) in binaries) { return binaries.isNotEmpty()
if (binaryPool[poolId] == attachment.binaryAttachment)
return true
}
return false
} }
fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) { fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {