From 3f33733f408385e3d6d4f0f239861a15c37c6eb2 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Tue, 15 Sep 2020 21:50:55 +0200
Subject: [PATCH] Fix expiry time

---
 .../java/com/kunzisoft/keepass/database/element/Entry.kt     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt
index e97ce4208..9f1e4b2b1 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt
@@ -426,6 +426,8 @@ class Entry : Node, EntryVersionedInterface<Group> {
         entryInfo.icon = icon
         entryInfo.username = username
         entryInfo.password = password
+        entryInfo.expires = expires
+        entryInfo.expiryTime = expiryTime
         entryInfo.url = url
         entryInfo.notes = notes
         entryInfo.customFields = getExtraFields()
@@ -448,7 +450,6 @@ class Entry : Node, EntryVersionedInterface<Group> {
         database?.startManageEntry(this)
 
         removeAllFields()
-        removeAllAttachments()
         // NodeId stay as is
         title = newEntryInfo.title
         icon = newEntryInfo.icon
@@ -460,6 +461,8 @@ class Entry : Node, EntryVersionedInterface<Group> {
         notes = newEntryInfo.notes
         addExtraFields(newEntryInfo.customFields)
         database?.binaryPool?.let { binaryPool ->
+            // TODO Concurrent modification
+            // removeAllAttachments()
             addAttachments(binaryPool, newEntryInfo.attachments)
         }