From 352214a4078bb414f792a5300a89a81af5151dec Mon Sep 17 00:00:00 2001
From: Chris Offner <chrisoffner@pm.me>
Date: Thu, 18 Mar 2021 12:10:07 +0100
Subject: [PATCH] Fixed merge conflict in IncomingMail, adapted Enum formatting
to Google style guide.
---
enzevalos_iphone/mail/IncomingMail.swift | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/enzevalos_iphone/mail/IncomingMail.swift b/enzevalos_iphone/mail/IncomingMail.swift
index 5fea5bf3..1235050f 100644
--- a/enzevalos_iphone/mail/IncomingMail.swift
+++ b/enzevalos_iphone/mail/IncomingMail.swift
@@ -9,7 +9,11 @@
import Foundation
enum PGPPart {
- case MESSAGE, PUBLICKEY, SIGNATURE, SECRETKEY, SIGNEDMESSAGE;
+ case MESSAGE
+ case PUBLICKEY
+ case SIGNATURE
+ case SECRETKEY
+ case SIGNEDMESSAGE
var start: String {
get {
@@ -90,7 +94,10 @@ enum PGPPart {
}
enum PgpMIMEType {
- case SIGNATURE, ENCRYPTED, OCTET, KEYS;
+ case SIGNATURE
+ case ENCRYPTED
+ case OCTET
+ case KEYS
static let allValues = [PgpMIMEType.ENCRYPTED, PgpMIMEType.KEYS, PgpMIMEType.OCTET, PgpMIMEType.SIGNATURE]
@@ -148,10 +155,8 @@ class IncomingMail {
keyIds.append(contentsOf: newPublicKeys)
if let fromAdr = from?.mailbox{
if let adr = PersistentDataProvider.dataProvider.generateFetchedAddressResultsController(address: fromAdr).fetchedObjects?.first {
- for k in adr.publicKeys {
- if let id = k.fingerprint {
- keyIds.append(id)
- }
+ for id in adr.keyIDs {
+ keyIds.append(id)
}
}
}
@@ -204,6 +209,7 @@ class IncomingMail {
return msgParser.data()
}
}
+
var decryptionKeyIDs: [String] {
get {
let secretkeys = PersistentDataProvider.dataProvider.fetchedSecretKeyResultsController.fetchedObjects ?? []
@@ -238,7 +244,6 @@ class IncomingMail {
}
}
-
init(rawData: Data, uID: UInt64, folderPath: String, flags: MCOMessageFlag){
self.rawData = rawData
self.uID = uID
--
GitLab