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 template entry edition

Browse Source
This commit is contained in:
J-Jamet
2021-07-20 19:53:52 +02:00
parent 13f8df4e0d
commit 706d117d80
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
View File

@@ -165,6 +165,18 @@ class Database {
return templatesGroup == entry.parent
}
// Not the same as decode, here remove in all cases the template link in the entry data
fun removeTemplateConfiguration(entry: Entry): Entry {
entry.entryKDBX?.let {
mDatabaseKDBX?.decodeEntryWithTemplateConfiguration(it, false)?.let { decode ->
return Entry(decode)
}
}
return entry
}
// Remove the template link in the entry data if it's a basic entry
// or compress the template fields (as pseudo language) if it's a template entry
fun decodeEntryWithTemplateConfiguration(entry: Entry, lastEntryVersion: Entry? = null): Entry {
entry.entryKDBX?.let {
val lastEntry = lastEntryVersion ?: entry

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

@@ -400,7 +400,7 @@ class Entry : Node, EntryVersionedInterface<Group> {
fun getEntryInfo(database: Database?, raw: Boolean = false): EntryInfo {
val entryInfo = EntryInfo()
// Remove unwanted template fields
(database?.decodeEntryWithTemplateConfiguration(this) ?: this).apply {
(database?.removeTemplateConfiguration(this) ?: this).apply {
if (raw)
database?.stopManageEntry(this)
else