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

Remove custom data last modification time recognition in Entry and Group

Browse Source
This commit is contained in:
J-Jamet
2021-05-01 13:03:44 +02:00
parent 9f67ad872d
commit 6d4398c6fd
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt
View File

@@ -94,10 +94,8 @@ class DatabaseInputKDBX(cacheDirectory: File,
private var customDataLastModificationTime: DateInstant? = null private var customDataLastModificationTime: DateInstant? = null
private var groupCustomDataKey: String? = null private var groupCustomDataKey: String? = null
private var groupCustomDataValue: String? = null private var groupCustomDataValue: String? = null
private var groupCustomDataLastModificationTime: DateInstant? = null
private var entryCustomDataKey: String? = null private var entryCustomDataKey: String? = null
private var entryCustomDataValue: String? = null private var entryCustomDataValue: String? = null
private var entryCustomDataLastModificationTime: DateInstant? = null
@Throws(LoadDatabaseException::class) @Throws(LoadDatabaseException::class)
override fun openDatabase(databaseInputStream: InputStream, override fun openDatabase(databaseInputStream: InputStream,
@@ -575,7 +573,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
KdbContext.GroupCustomDataItem -> when { KdbContext.GroupCustomDataItem -> when {
name.equals(DatabaseKDBXXML.ElemKey, ignoreCase = true) -> groupCustomDataKey = readString(xpp) name.equals(DatabaseKDBXXML.ElemKey, ignoreCase = true) -> groupCustomDataKey = readString(xpp)
name.equals(DatabaseKDBXXML.ElemValue, ignoreCase = true) -> groupCustomDataValue = readString(xpp) name.equals(DatabaseKDBXXML.ElemValue, ignoreCase = true) -> groupCustomDataValue = readString(xpp)
name.equals(DatabaseKDBXXML.ElemValue, ignoreCase = true) -> groupCustomDataLastModificationTime = readDateInstant(xpp) name.equals(DatabaseKDBXXML.ElemLastModTime, ignoreCase = true) -> readDateInstant(xpp) // Ignore
else -> readUnknown(xpp) else -> readUnknown(xpp)
} }
@@ -626,7 +624,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
KdbContext.EntryCustomDataItem -> when { KdbContext.EntryCustomDataItem -> when {
name.equals(DatabaseKDBXXML.ElemKey, ignoreCase = true) -> entryCustomDataKey = readString(xpp) name.equals(DatabaseKDBXXML.ElemKey, ignoreCase = true) -> entryCustomDataKey = readString(xpp)
name.equals(DatabaseKDBXXML.ElemValue, ignoreCase = true) -> entryCustomDataValue = readString(xpp) name.equals(DatabaseKDBXXML.ElemValue, ignoreCase = true) -> entryCustomDataValue = readString(xpp)
name.equals(DatabaseKDBXXML.ElemValue, ignoreCase = true) -> entryCustomDataLastModificationTime = readDateInstant(xpp) name.equals(DatabaseKDBXXML.ElemLastModTime, ignoreCase = true) -> readDateInstant(xpp) // Ignore
else -> readUnknown(xpp) else -> readUnknown(xpp)
} }
@@ -784,13 +782,11 @@ class DatabaseInputKDBX(cacheDirectory: File,
} else if (ctx == KdbContext.GroupCustomDataItem && name.equals(DatabaseKDBXXML.ElemStringDictExItem, ignoreCase = true)) { } else if (ctx == KdbContext.GroupCustomDataItem && name.equals(DatabaseKDBXXML.ElemStringDictExItem, ignoreCase = true)) {
groupCustomDataKey?.let { customDataKey -> groupCustomDataKey?.let { customDataKey ->
groupCustomDataValue?.let { customDataValue -> groupCustomDataValue?.let { customDataValue ->
ctxGroup?.customData?.put(CustomDataItem(customDataKey, ctxGroup?.customData?.put(CustomDataItem(customDataKey, customDataValue))
customDataValue, groupCustomDataLastModificationTime))
} }
} }
groupCustomDataKey = null groupCustomDataKey = null
groupCustomDataValue = null groupCustomDataValue = null
groupCustomDataLastModificationTime = null
return KdbContext.GroupCustomData return KdbContext.GroupCustomData
} else if (ctx == KdbContext.Entry && name.equals(DatabaseKDBXXML.ElemEntry, ignoreCase = true)) { } else if (ctx == KdbContext.Entry && name.equals(DatabaseKDBXXML.ElemEntry, ignoreCase = true)) {
@@ -838,13 +834,11 @@ class DatabaseInputKDBX(cacheDirectory: File,
} else if (ctx == KdbContext.EntryCustomDataItem && name.equals(DatabaseKDBXXML.ElemStringDictExItem, ignoreCase = true)) { } else if (ctx == KdbContext.EntryCustomDataItem && name.equals(DatabaseKDBXXML.ElemStringDictExItem, ignoreCase = true)) {
entryCustomDataKey?.let { customDataKey -> entryCustomDataKey?.let { customDataKey ->
entryCustomDataValue?.let { customDataValue -> entryCustomDataValue?.let { customDataValue ->
ctxEntry?.customData?.put(CustomDataItem(customDataKey, ctxEntry?.customData?.put(CustomDataItem(customDataKey, customDataValue))
customDataValue, entryCustomDataLastModificationTime))
} }
} }
entryCustomDataKey = null entryCustomDataKey = null
entryCustomDataValue = null entryCustomDataValue = null
entryCustomDataLastModificationTime = null
return KdbContext.EntryCustomData return KdbContext.EntryCustomData
} else if (ctx == KdbContext.EntryHistory && name.equals(DatabaseKDBXXML.ElemHistory, ignoreCase = true)) { } else if (ctx == KdbContext.EntryHistory && name.equals(DatabaseKDBXXML.ElemHistory, ignoreCase = true)) {
entryInHistory = false entryInHistory = false