From 3b71a9208933567cecc49da3de852bc936cedf12 Mon Sep 17 00:00:00 2001
From: Christophe Vila <kriss@vilanet.fr>
Date: Fri, 22 May 2026 14:29:24 +0200
Subject: [PATCH] fix: correct encrypt method name, remove tags, preserve UUIDs
 in KDBXMapper

---
 MyPassCore/Sources/MyPassCore/KDBX/KDBXDocument.swift | 2 +-
 MyPassCore/Sources/MyPassCore/KDBX/KDBXMapper.swift   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MyPassCore/Sources/MyPassCore/KDBX/KDBXDocument.swift b/MyPassCore/Sources/MyPassCore/KDBX/KDBXDocument.swift
index 5de7dda..8ccb27a 100644
--- a/MyPassCore/Sources/MyPassCore/KDBX/KDBXDocument.swift
+++ b/MyPassCore/Sources/MyPassCore/KDBX/KDBXDocument.swift
@@ -32,7 +32,7 @@ public struct KDBXDocument {
         let tree = KDBXMapper.tree(from: database)
         let key = KPKCompositeKey(keys: [KPKKey.init(password: password)])
         var error: NSError?
-        guard let data = tree.encrypt(with: key, format: .kdbx, error: &error) else {
+        guard let data = tree.encryptWithKey(key, format: .kdbx, error: &error) else {
             let description = error?.localizedDescription ?? "Unknown error writing KDBX file"
             throw KDBXError.writeError(description)
         }
diff --git a/MyPassCore/Sources/MyPassCore/KDBX/KDBXMapper.swift b/MyPassCore/Sources/MyPassCore/KDBX/KDBXMapper.swift
index 4b8c333..bb73a27 100644
--- a/MyPassCore/Sources/MyPassCore/KDBX/KDBXMapper.swift
+++ b/MyPassCore/Sources/MyPassCore/KDBX/KDBXMapper.swift
@@ -58,7 +58,7 @@ enum KDBXMapper {
             customFields: customFields,
             attachments: attachments,
             totp: totpConfig,
-            tags: e.tags ?? [],
+            tags: [],
             iconIndex: Int(e.iconId),
             expiryDate: e.timeInfo?.expires == true ? e.timeInfo?.expirationDate : nil,
             creationDate: e.timeInfo?.creationDate ?? Date(),
@@ -79,7 +79,7 @@ enum KDBXMapper {
     }
 
     static func kpkGroup(from g: Group) -> KPKGroup {
-        let kpk = KPKGroup()
+        let kpk = KPKGroup(uuid: NSUUID(uuidString: g.id.uuidString))
         kpk.title = g.name
         kpk.iconId = g.iconIndex
         for sub in g.subgroups {
@@ -92,7 +92,7 @@ enum KDBXMapper {
     }
 
     static func kpkEntry(from e: Entry) -> KPKEntry {
-        let kpk = KPKEntry()
+        let kpk = KPKEntry(uuid: NSUUID(uuidString: e.id.uuidString))
         kpk.title    = e.title
         kpk.username = e.username
         kpk.password = e.password.reveal()