diff --git a/enzevalos_iphone/LoggerDetail.swift b/enzevalos_iphone/LoggerDetail.swift
index 47ade68551f8c3aac8caa6dd60875287062db2be..4e24c50007b540d1f1582dffcd77019ef38291a7 100644
--- a/enzevalos_iphone/LoggerDetail.swift
+++ b/enzevalos_iphone/LoggerDetail.swift
@@ -405,7 +405,7 @@ class LoggerDetail {
event["bodyLength"] = (mail.body)?.count
event["encState"] = mail.encryptionState.rawValue
event["decryptedBodyLength"] = (mail.body ?? "").count
- event["signatureState"] = mail.signedState.rawValue
+ event["signatureState"] = mail.signatureState.rawValue
event["x-Mailer"] = mail.xMailer
//TODO:
//event["signingKeyID"] = Logger.resolve(keyID: signingKeyID)
diff --git a/enzevalos_iphone/SwiftUI/Data/DisplayProtocols.swift b/enzevalos_iphone/SwiftUI/Data/DisplayProtocols.swift
index 4b8e59a6ed3d9b689c688e0ac8ee4bc3b0be81bc..f26686fe6ae97a9b3be218c54dbb27887416b47e 100644
--- a/enzevalos_iphone/SwiftUI/Data/DisplayProtocols.swift
+++ b/enzevalos_iphone/SwiftUI/Data/DisplayProtocols.swift
@@ -108,8 +108,8 @@ protocol DisplayMail {
var displayAttachments: [DisplayAttachment] { get }
// Crypto
- var signedState: SignatureState { get }
- var encState: EncryptionState { get }
+ var signatureState: SignatureState { get }
+ var encryptionState: EncryptionState { get }
var transportEnc: Bool { get }
var persistentMail: MailRecord? { get }
@@ -289,7 +289,7 @@ extension DisplayMail {
case (_, .UnableToDecrypt), (_, .InvalidSignature) , (_, .PlainMissingPublicKeyToVerify), (_, .EncButMissingPublicKeyToVerify):
result.append(dialog) // warning required
}
- if self.sender.keyIDs.count > 0 && self.signedState == .NoSignature {
+ if self.sender.keyIDs.count > 0 && self.signatureState == .NoSignature {
let icon = Image(systemName: "exclamationmark.triangl.fill")
let missingSignature = DialogStruct(dialogColor: Color(ThemeManager.unencryptedMessageColor()),
title: NSLocalizedString("encryptedBeforeHeadline",
@@ -317,7 +317,7 @@ extension DisplayMail {
}
private func evaluateCryptoState() -> CryptoState {
- switch (self.encState, self.signedState) {
+ switch (self.encryptionState, self.signatureState) {
// General error cases -> cast other states
case (.UnableToDecrypt, _): return .UnableToDecrypt
case (_, .InvalidSignature): return .InvalidSignature
@@ -336,14 +336,14 @@ extension DisplayMail {
var trouble: Bool { //TODO: What are troubles? Have we more cases? Can we remove this attribute?
get {
- return signedState == .InvalidSignature || encState == .UnableToDecrypt
+ return signatureState == .InvalidSignature || encryptionState == .UnableToDecrypt
}
}
//TODO: What is a secure mail? Have we more cases? Can we remove this attribute?
var isSecure: Bool {
get {
- return signedState == .ValidSignature && (encState == .ValidEncryptedWithOldKey || encState == .ValidedEncryptedWithCurrentKey)
+ return signatureState == .ValidSignature && (encryptionState == .ValidEncryptedWithOldKey || encryptionState == .ValidedEncryptedWithCurrentKey)
}
}
diff --git a/enzevalos_iphone/SwiftUI/Data/SimulatorData.swift b/enzevalos_iphone/SwiftUI/Data/SimulatorData.swift
index a61a277901ca1e902556aa830f38cdcf3d1d9b21..d5e0e669967c61cbbd4a31ba93da19717573dc30 100644
--- a/enzevalos_iphone/SwiftUI/Data/SimulatorData.swift
+++ b/enzevalos_iphone/SwiftUI/Data/SimulatorData.swift
@@ -51,12 +51,12 @@ struct ProxyData {
static let mails = [ProxyData.SecureMail, ProxyData.PlainMail, ProxyData.SignedOnlyMail, ProxyData.MissingPKMail, ProxyData.NotDecryptedMail, ProxyData.CorruptedMail]
/// Different Mails
- static let SecureMail = ProxyMail(previewName: "Secure mail", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signedState: SignatureState.ValidSignature, encState: .ValidedEncryptedWithCurrentKey)
- static let NotDecryptedMail = ProxyMail(previewName: "Can not decrypt", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signedState: SignatureState.ValidSignature, encState: .UnableToDecrypt)
- static let PlainMail = ProxyMail(previewName: "Plain mail", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signedState: SignatureState.NoSignature, encState: .NoEncryption)
- static let SignedOnlyMail = ProxyMail(previewName: "Signed only mail", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signedState: SignatureState.ValidSignature, encState: .NoEncryption)
- static let CorruptedMail = ProxyMail(previewName: "Corrupted mail", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signedState: SignatureState.InvalidSignature, encState: .ValidedEncryptedWithCurrentKey)
- static let MissingPKMail = ProxyMail(previewName: "Mising public key", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signedState: SignatureState.NoPublicKey, encState: .ValidedEncryptedWithCurrentKey)
+ static let SecureMail = ProxyMail(previewName: "Secure mail", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signatureState: SignatureState.ValidSignature, encryptionState: .ValidedEncryptedWithCurrentKey)
+ static let NotDecryptedMail = ProxyMail(previewName: "Can not decrypt", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signatureState: SignatureState.ValidSignature, encryptionState: .UnableToDecrypt)
+ static let PlainMail = ProxyMail(previewName: "Plain mail", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signatureState: SignatureState.NoSignature, encryptionState: .NoEncryption)
+ static let SignedOnlyMail = ProxyMail(previewName: "Signed only mail", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signatureState: SignatureState.ValidSignature, encryptionState: .NoEncryption)
+ static let CorruptedMail = ProxyMail(previewName: "Corrupted mail", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signatureState: SignatureState.InvalidSignature, encryptionState: .ValidedEncryptedWithCurrentKey)
+ static let MissingPKMail = ProxyMail(previewName: "Mising public key", folderType: .Inbox, sender: Alice, tos: [Bob, Charlie], ccs: [Bob, Charlie, Bob, Charlie, Bob], bccs: [Bob], routingStops: Landmarks, signatureState: SignatureState.NoPublicKey, encryptionState: .ValidedEncryptedWithCurrentKey)
static let Attachment = ProxyAttachment()
}
@@ -180,9 +180,9 @@ struct ProxyMail: DisplayMail {
var routingStops: [Landmark]
- var signedState: SignatureState
+ var signatureState: SignatureState
- var encState: EncryptionState
+ var encryptionState: EncryptionState
var persistentMail: MailRecord? {
return nil
diff --git a/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift b/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift
index cf29545a64a3dde96c9c83b539d3dd7fa7c9a1fb..a02b186b22cf991022237a6038e67eefe81d70c8 100644
--- a/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift
+++ b/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift
@@ -46,7 +46,7 @@ struct SecurityBriefingView<M: DisplayMail>: View {
var confidentiality: some View {
var stateString: LocalizedStringKey
- switch (mail.encState, mail.transportEnc) {
+ switch (mail.encryptionState, mail.transportEnc) {
case (.NoEncryption, true): stateString = "ReadView.SecurityBriefing.Conf.State.TransportEnc"
case (.NoEncryption, false): stateString = "ReadView.SecurityBriefing.Conf.State.Plain"
case (.UnableToDecrypt, _): stateString = "ReadView.SecurityBriefing.Conf.State.UnableToDecrypt"
@@ -57,12 +57,12 @@ struct SecurityBriefingView<M: DisplayMail>: View {
titleString: "ReadView.SecurityBriefing.Conf.Title",
descriptionString: "ReadView.SecurityBriefing.Conf.Description",
stateString: stateString,
- padding: padding, rating: mail.encState.rating)
+ padding: padding, rating: mail.signatureState.rating)
}
var authenticity: some View {
var stateString: LocalizedStringKey
- switch mail.signedState {
+ switch mail.signatureState {
case .InvalidSignature:
stateString = "ReadView.SecurityBriefing.Auth.State.InvalidSignature"
case .NoSignature:
@@ -76,7 +76,7 @@ struct SecurityBriefingView<M: DisplayMail>: View {
titleString: "ReadView.SecurityBriefing.Auth.Title",
descriptionString: "ReadView.SecurityBriefing.Auth.Description",
stateString: stateString,
- padding: padding, rating: mail.signedState.rating)
+ padding: padding, rating: mail.signatureState.rating)
}
var actions: some View {
diff --git a/enzevalos_iphone/persistentData/MailRecord.swift b/enzevalos_iphone/persistentData/MailRecord.swift
index e0fd1cb1ee13d12f351174fdc7a85eb32892cfb4..26bf543a8a94aed9a4a3a6c105124d9e2769fb25 100644
--- a/enzevalos_iphone/persistentData/MailRecord.swift
+++ b/enzevalos_iphone/persistentData/MailRecord.swift
@@ -141,10 +141,6 @@ extension MailRecord: DisplayMail {
}
}
- var encState: EncryptionState {
- return encryptionState
- }
-
typealias C = AddressRecord
var sender: C {
@@ -180,10 +176,6 @@ extension MailRecord: DisplayMail {
return [] // TODO
}
- var signedState: SignatureState {
- return SignatureState.init(rawValue: self.signatureStateInt) ?? .NoSignature
- }
-
var persistentMail: MailRecord? {
return self
}