fix: correct encrypt method name, remove tags, preserve UUIDs in KDBXMapper

This commit is contained in:
2026-05-22 14:29:24 +02:00
parent a7d9c65dfb
commit 3b71a92089
2 changed files with 4 additions and 4 deletions
@@ -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)
}
@@ -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()