From e25531cd9a94ae33df8db18a7d74c2091ed188e1 Mon Sep 17 00:00:00 2001 From: Oliver Wiese <oliver.wiese@fu-berlin.de> Date: Mon, 15 Mar 2021 17:12:45 +0100 Subject: [PATCH] fix matching to lastsignedMail --- enzevalos_iphone/mail/IncomingMail.swift | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/enzevalos_iphone/mail/IncomingMail.swift b/enzevalos_iphone/mail/IncomingMail.swift index c7c22e72..a19c2cdc 100644 --- a/enzevalos_iphone/mail/IncomingMail.swift +++ b/enzevalos_iphone/mail/IncomingMail.swift @@ -267,8 +267,8 @@ class IncomingMail { } let encState = self.cryptoObj?.encryptionState.rawValue ?? 0 - var lastsignedDate: Date? = nil // TODO: Remove from PublicKeyProperty -> Update this in Record file... - if let sigState = self.cryptoObj?.signatureState, sigState == .ValidSignature { + var lastsignedDate: Date? = nil + if let sigState = self.cryptoObj?.signatureState, sigState == .ValidSignature{ lastsignedDate = self.date } var usedAddr = [AddressProperties]() @@ -278,7 +278,11 @@ class IncomingMail { var autocryptPK = [PublicKeyProperties]() for fpr in newAutocrypPublicKeys { - let pk = PublicKeyProperties(fingerprint: fpr, cryptoProtocol: .PGP, origin: .AutocryptHeader, preferEncryption: autocrypt?.prefer_encryption, lastSeenInAutocryptHeader: date, lastSeenSignedMail: nil, secretKeyProperty: nil, usedAddresses: usedAddr) + var signed: Date? = nil + if let sigendKeys = self.cryptoObj?.signedKeys, sigendKeys.contains(fpr) { + signed = lastsignedDate + } + let pk = PublicKeyProperties(fingerprint: fpr, cryptoProtocol: .PGP, origin: .AutocryptHeader, preferEncryption: autocrypt?.prefer_encryption, lastSeenInAutocryptHeader: date, lastSeenSignedMail: signed, secretKeyProperty: nil, usedAddresses: usedAddr) autocryptPK.append(pk) } -- GitLab