diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index 53e751a3869460e8bc13f49aedeabc3a261ebec4..a378c3edab020c4e0f0ded4ece2b7338f3615e23 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -534,7 +534,7 @@
}
if let uidValidity = fromFolder.uidValidity as? UInt32 {
self.moveOnServer(uidValidity: uidValidity, mails: mails, fromPath: fromPath, toPath: toPath, completionHandler: {error in
- print("Move mails from \(fromFolder) to \(toPath) complete with error \(error)")})
+ print("Move mails from \(fromFolder) to \(toPath) complete with error \(String(describing: error))")})
// 4. Move mail in core data
self.dataProvider.moveMails(with: mails, from: fromPath, to: toPath)
}
diff --git a/enzevalos_iphone/persistentData/PersistentDataProvider.swift b/enzevalos_iphone/persistentData/PersistentDataProvider.swift
index 31664406639fd96d659ece43a88cf3f098d93282..c70a4aaa491fc7e12f26ea40f1a5b3677fedbe21 100644
--- a/enzevalos_iphone/persistentData/PersistentDataProvider.swift
+++ b/enzevalos_iphone/persistentData/PersistentDataProvider.swift
@@ -490,6 +490,7 @@ class PersistentDataProvider {
}
guard let toFolder = generateFetchedFolderResultsController(folderpath: to, moc: rfc.managedObjectContext).fetchedObjects?.first else {
importNewData(from: [FolderProperties(delimiter: nil, uidValidity: nil, lastUpdate: nil, maxUID: nil, minUID: nil, path: to, parent: nil, children: nil)], completionHandler: {_ in self.moveMails(with: uids, from: from, to: to)})
+ moveMails(with: uids, from: from, to: to)
return
}
if let mails = rfc.fetchedObjects as? [MailRecord] {
diff --git a/enzevalos_iphoneTests/AutocryptTest.swift b/enzevalos_iphoneTests/AutocryptTest.swift
index d5072f6c8432de15c8a4d3aac58cfa656301ecb6..a9ad4a3bd8ffdf8daba5300ffd6500f11b0b612e 100644
--- a/enzevalos_iphoneTests/AutocryptTest.swift
+++ b/enzevalos_iphoneTests/AutocryptTest.swift
@@ -67,7 +67,7 @@ class AutocryptTest: XCTestCase {
super.setUp()
pgp.resetKeychains()
let deleteExpectation = expectation(description: "Delete all data!")
- PersitentDataProvider.dataProvider.deleteAll(completionHandler: {error in
+ PersistentDataProvider.dataProvider.deleteAll(completionHandler: {error in
if let error = error {
XCTFail("Error while importing addresses! \(error)")
}
@@ -138,7 +138,7 @@ class AutocryptTest: XCTestCase {
}
func testAutocryptHeader(){
- let outmail = OutgoingMail(toEntrys: ["alice@example.com"], ccEntrys: [], bccEntrys: [], subject: "subject", textContent: "Body", htmlContent: nil)
+ let outmail = OutgoingMail(toAddresses: ["alice@example.com"], ccAddresses: [], bccAddresses: [], subject: "subject", textContent: "Body", htmlContent: nil)
if let parser = MCOMessageParser(data: outmail.plainData), let _ = pgp.exportKey(id: userKeyID, isSecretkey: false, autocrypt: false) {
let autocrypt = Autocrypt.init(header: parser.header)
XCTAssertEqual(autocrypt.addr, userAdr)
diff --git a/enzevalos_iphoneTests/CoreAddressTest.swift b/enzevalos_iphoneTests/CoreAddressTest.swift
index c6b1710f5c44d1e45dd112e3dffee76eb7ce1c57..31a98b707aae571c6576378567579695b202d471 100644
--- a/enzevalos_iphoneTests/CoreAddressTest.swift
+++ b/enzevalos_iphoneTests/CoreAddressTest.swift
@@ -10,10 +10,10 @@ import XCTest
@testable import enzevalos_iphone
class CoreAddressTest: XCTestCase {
- var provider = PersitentDataProvider()
+ var provider = PersistentDataProvider()
private func deleteAll() {
- provider = PersitentDataProvider()
+ provider = PersistentDataProvider()
let deleteExpectation = expectation(description: "Delete all data!")
provider.deleteAll(completionHandler: {error in
if let error = error {
@@ -25,7 +25,7 @@ class CoreAddressTest: XCTestCase {
provider.reset()
let frc = provider.fetchedAddressResultController
XCTAssertEqual(frc.fetchedObjects?.count ?? 0, 0)
- provider = PersitentDataProvider()
+ provider = PersistentDataProvider()
}
override func setUpWithError() throws {
diff --git a/enzevalos_iphoneTests/CoreKeysTest.swift b/enzevalos_iphoneTests/CoreKeysTest.swift
index 3dd09c642c9faff4d46bb0d406851aa6818c92c2..f9fc7001a194ea02f5d0ecc1f606ff1cdc7e35fd 100644
--- a/enzevalos_iphoneTests/CoreKeysTest.swift
+++ b/enzevalos_iphoneTests/CoreKeysTest.swift
@@ -11,11 +11,11 @@ import XCTest
@testable import enzevalos_iphone
class CoreKeysTest: XCTestCase {
- var provider = PersitentDataProvider()
+ var provider = PersistentDataProvider()
let email = "vic@example.com"
private func deleteAll() {
- provider = PersitentDataProvider()
+ provider = PersistentDataProvider()
let deleteExpectation = expectation(description: "Delete all data!")
provider.deleteAll(completionHandler: {error in
if let error = error {
@@ -27,7 +27,7 @@ class CoreKeysTest: XCTestCase {
provider.reset()
let frc = provider.fetchedMailResultsController
XCTAssertEqual(frc.fetchedObjects?.count ?? 0, 0)
- provider = PersitentDataProvider()
+ provider = PersistentDataProvider()
}
override func setUpWithError() throws {
diff --git a/enzevalos_iphoneTests/CoreMailTest.swift b/enzevalos_iphoneTests/CoreMailTest.swift
index d5dc7f150791e1db388bec3cdc61726efb39c6a8..64954e7a3556bc2abfffaa6f628d007b2a356f7b 100644
--- a/enzevalos_iphoneTests/CoreMailTest.swift
+++ b/enzevalos_iphoneTests/CoreMailTest.swift
@@ -17,12 +17,12 @@ import XCTest
@testable import enzevalos_iphone
class CoreMailTest: XCTestCase {
- var provider = PersitentDataProvider()
+ var provider = PersistentDataProvider()
let path = "Testfolder"
private func deleteAll() {
- provider = PersitentDataProvider()
+ provider = PersistentDataProvider()
let deleteExpectation = expectation(description: "Delete all data!")
provider.deleteAll(completionHandler: {error in
if let error = error {
@@ -34,7 +34,7 @@ class CoreMailTest: XCTestCase {
provider.reset()
let frc = provider.fetchedMailResultsController
XCTAssertEqual(frc.fetchedObjects?.count ?? 0, 0)
- provider = PersitentDataProvider()
+ provider = PersistentDataProvider()
}
override func setUpWithError() throws {
@@ -56,8 +56,8 @@ class CoreMailTest: XCTestCase {
let importExpectation = expectation(description: "Import new msg!")
- let m1 = MailProperties(messageID: "1", subject: "MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0, attachedPublicKeys: [], attachedSecretKeys: [])
- let m2 = MailProperties(messageID: "2", subject: "MSG2", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
+ let m1 = MailProperties(messageID: "1", uid: UInt64(arc4random()), subject: "MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0, attachedPublicKeys: [], attachedSecretKeys: [])
+ let m2 = MailProperties(messageID: "2", uid: UInt64(arc4random()), subject: "MSG2", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
provider.importNewData(from: [m1,m2], completionHandler: {error in
if let error = error {
@@ -91,8 +91,8 @@ class CoreMailTest: XCTestCase {
let addr1 = AddressProperties(email: "vic@example.com")
let folder = FolderProperties(delimiter: nil, uidValidity: nil, lastUpdate: nil, maxUID: nil, minUID: nil, path: "Testfolder", parent: nil, children: nil)
- let m1 = MailProperties(messageID: "1", subject: "MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
- let m2 = MailProperties(messageID: "1", subject: "Second MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
+ let m1 = MailProperties(messageID: "1", uid: UInt64(arc4random()), subject: "MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
+ let m2 = MailProperties(messageID: "1", uid: UInt64(arc4random()), subject: "Second MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
provider.reset()
let frc = provider.fetchedMailResultsController
@@ -123,8 +123,8 @@ class CoreMailTest: XCTestCase {
let addr1 = AddressProperties(email: "vic@example.com")
let folder = FolderProperties(delimiter: nil, uidValidity: nil, lastUpdate: nil, maxUID: nil, minUID: nil, path: "Testfolder", parent: nil, children: nil)
- let m1 = MailProperties(messageID: "1", subject: "MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
- let m2 = MailProperties(messageID: "1", subject: "Second MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
+ let m1 = MailProperties(messageID: "1", uid: UInt64(arc4random()), subject: "MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
+ let m2 = MailProperties(messageID: "1", uid: UInt64(arc4random()), subject: "Second MSG1", date: Date(), flags: 0, from: addr1, folder: folder, signatureState: 0, encryptionState: 0)
provider.reset()
let frc = provider.fetchedMailResultsController
@@ -177,7 +177,7 @@ class CoreMailTest: XCTestCase {
var msgs = [MailProperties]()
for i in 1...n {
let a = addrs[i%addrs.count]
- let m = MailProperties(messageID: "\(i)", subject: "MSG\(i)", date: Date(), flags: 0, from: a, folder: folder, signatureState: 0, encryptionState: 0)
+ let m = MailProperties(messageID: "\(i)", uid: UInt64(arc4random()), subject: "MSG\(i)", date: Date(), flags: 0, from: a, folder: folder, signatureState: 0, encryptionState: 0)
msgs.append(m)
}
@@ -212,9 +212,7 @@ class CoreMailTest: XCTestCase {
}
- private func generateMails() -> Int {
- let n = 100
- let m = 10
+ private func generateMails(n: Int = 100, m: Int = 10) -> Int {
var k = 1
let addr1 = AddressProperties(email: "vic@example.com")
@@ -228,7 +226,7 @@ class CoreMailTest: XCTestCase {
var msgs = [MailProperties]()
for i in 1...n {
let a = addrs[i%addrs.count]
- let msg = MailProperties(messageID: "\(k)", subject: "MSG\(k)", date: Date(), flags: 0, from: a, folder: folder, signatureState: 0, encryptionState: 0)
+ let msg = MailProperties(messageID: "\(k)", uid: UInt64(arc4random()), subject: "MSG\(k)", date: Date(), flags: 0, from: a, folder: folder, signatureState: 0, encryptionState: 0)
k = k + 1
res = res + 1
msgs.append(msg)
@@ -279,8 +277,8 @@ class CoreMailTest: XCTestCase {
var n = generateMails()
let genMails = n
// CONSIDER FETCHLIMIT!
- if n > PersitentDataProvider.FETCHLIMIT {
- n = PersitentDataProvider.FETCHLIMIT
+ if n > PersistentDataProvider.FETCHLIMIT {
+ n = PersistentDataProvider.FETCHLIMIT
}
let frc = provider.generateFetchedMailsInFolderResultsController(folderpath: path)
try? frc.performFetch()
@@ -302,4 +300,25 @@ class CoreMailTest: XCTestCase {
XCTAssertEqual(folder.mailsInFolder?.count ?? -1, genMails)
}
}
+
+ func testMoveMail() {
+ let n = generateMails(n: 100, m: 1)
+ let folderPath2 = "Testfolder2"
+ let frc = provider.generateFetchedMailsInFolderResultsController(folderpath: path)
+ try? frc.performFetch()
+ if let mails = frc.fetchedObjects {
+ XCTAssertEqual(mails.count, n)
+ if let mail = mails.first {
+ provider.moveMails(with: [UInt64(mail.uID)], from: path, to: folderPath2)
+ try? frc.performFetch()
+ XCTAssertEqual(frc.fetchedObjects?.count ?? 0,( n - 1))
+ let frc2 = provider.generateFetchedMailsInFolderResultsController(folderpath: folderPath2)
+ XCTAssertEqual(frc2.fetchedObjects?.count ?? 0, 1)
+ }
+ }
+ else {
+ XCTFail("No mails...")
+ }
+
+ }
}
diff --git a/enzevalos_iphoneTests/CryptoTests.swift b/enzevalos_iphoneTests/CryptoTests.swift
index 953b95544dbe345e1e815e1df885aafaf0bb809c..67bafb993303d74544a55b217a37e5a70fa8265f 100644
--- a/enzevalos_iphoneTests/CryptoTests.swift
+++ b/enzevalos_iphoneTests/CryptoTests.swift
@@ -390,7 +390,7 @@ class CryptoTests: XCTestCase {
"""
private func deleteAll() {
- let provider = PersitentDataProvider()
+ let provider = PersistentDataProvider()
let deleteExpectation = expectation(description: "Delete all data!")
provider.deleteAll(completionHandler: {error in
if let error = error {
@@ -575,7 +575,7 @@ class CryptoTests: XCTestCase {
SecretKeyProperties(fingerprint: $0, cryptoProtocol: .PGP, usedAddresses: [AddressProperties(email: userAdr)])
})
let importExpectation = expectation(description: "Import secret keys")
- PersitentDataProvider.dataProvider.importNewData(from: properties, completionHandler: {error in
+ PersistentDataProvider.dataProvider.importNewData(from: properties, completionHandler: {error in
if let error = error {
XCTFail("Error while importing addresses! \(error)")
}
@@ -584,7 +584,7 @@ class CryptoTests: XCTestCase {
wait(for: [importExpectation], timeout: TimeInterval(20))
if let newPrefId = keys.first {
UserManager.storeUserValue(newPrefId as AnyObject, attribute: .prefSecretKeyID)
- XCTAssertEqual(PersitentDataProvider.prefKeyID, newPrefId)
+ XCTAssertEqual(PersistentDataProvider.prefKeyID, newPrefId)
}
else {
XCTFail("No pref. sk!")
@@ -611,10 +611,10 @@ class CryptoTests: XCTestCase {
let subject = "Test mail"
let folder = FolderProperties(delimiter: nil, uidValidity: nil, lastUpdate: nil, maxUID: nil, minUID: nil, path: "Testfolder", parent: nil, children: nil)
- let mail = MailProperties(messageID: "dasdads", subject: subject, date: Date(), flags: 0, from: from, to: to, cc: [], bcc: [], folder: folder, body: body, attachments: [], signatureState: sigState.rawValue, encryptionState: encState.rawValue, signatureKey: nil, decryptionKey: nil, autocryptHeaderKey: [], attachedPublicKeys: [], attachedSecretKeys: [])
+ let mail = MailProperties(messageID: "dasdads", uid: UInt64(arc4random()), subject: subject, date: Date(), flags: 0, from: from, to: to, cc: [], bcc: [], folder: folder, body: body, attachments: [], signatureState: sigState.rawValue, encryptionState: encState.rawValue, signatureKey: nil, decryptionKey: nil, autocryptHeaderKey: [], attachedPublicKeys: [], attachedSecretKeys: [])
let importExpectation = expectation(description: "Import email")
- PersitentDataProvider.dataProvider.importNewData(from: [mail], completionHandler: {error in
+ PersistentDataProvider.dataProvider.importNewData(from: [mail], completionHandler: {error in
if let error = error {
XCTFail("Error while importing addresses! \(error)")
}
@@ -650,7 +650,7 @@ class CryptoTests: XCTestCase {
// Create test Mail
_ = testMail(from: AddressProperties(email: "sender@example.com"),to: [user], body: cipher, encState: .UnableToDecrypt, sigState: .NoSignature)
- let controller = PersitentDataProvider.dataProvider.generateFetchedUnableToDecryptMailsResultsController()
+ let controller = PersistentDataProvider.dataProvider.generateFetchedUnableToDecryptMailsResultsController()
do {
try controller.performFetch()
}
@@ -770,7 +770,7 @@ class CryptoTests: XCTestCase {
}
let model = KeyManagementModel()
XCTAssertEqual(model.storedKeys.count, 1)
- let skController = PersitentDataProvider.dataProvider.fetchedSecretKeyResultsController
+ let skController = PersistentDataProvider.dataProvider.fetchedSecretKeyResultsController
XCTAssertEqual(skController.fetchedObjects?.count, 0)
for key in model.storedKeys {
key.password = CryptoTests.importPW
diff --git a/enzevalos_iphoneTests/GeneratedMocks.swift b/enzevalos_iphoneTests/GeneratedMocks.swift
index 90fd44ce27f9cb8e4141339f0d7a08a2c7135541..581522790fbe923af96a51b0daee6a923b700485 100644
--- a/enzevalos_iphoneTests/GeneratedMocks.swift
+++ b/enzevalos_iphoneTests/GeneratedMocks.swift
@@ -1,4 +1,4 @@
-// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationModel.swift at 2021-03-15 16:18:38 +0000
+// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationModel.swift at 2021-04-08 09:17:40 +0000
//
// AuthenticationModel.swift
@@ -654,7 +654,7 @@ import Foundation
}
-// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationViewModel.swift at 2021-03-15 16:18:38 +0000
+// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationViewModel.swift at 2021-04-08 09:17:40 +0000
//
// AuthenticationViewModel.swift
diff --git a/enzevalos_iphoneTests/MailTest.swift b/enzevalos_iphoneTests/MailTest.swift
index 0e6a2b95e0ca7cfff9b4c918f7fd03e704d2110e..30ad8070884176cc7a3942832c05a31014be76de 100644
--- a/enzevalos_iphoneTests/MailTest.swift
+++ b/enzevalos_iphoneTests/MailTest.swift
@@ -50,7 +50,7 @@ What about errors and special cases?
@testable import enzevalos_iphone
class MailTest: XCTestCase {
- let dataprovider = PersitentDataProvider.dataProvider
+ let dataprovider = PersistentDataProvider.dataProvider
let mailHandler = LetterboxModel.instance.mailHandler
let pgp = SwiftPGP()
let userAdr = "bob@enzevalos.de"
@@ -86,7 +86,7 @@ n1O3czuVl7rPXrJn0A/MVI2ReKOQeIAYMg==
"""
private func deleteAll() {
- let provider = PersitentDataProvider()
+ let provider = PersistentDataProvider()
let deleteExpectation = expectation(description: "Delete all data!")
provider.deleteAll(completionHandler: {error in
if let error = error {
@@ -143,7 +143,7 @@ n1O3czuVl7rPXrJn0A/MVI2ReKOQeIAYMg==
let bccs = ["bcc1@example.com"]
let subject = "subject"
let body = "This is the body"
- let outMail = OutgoingMail(toEntrys: tos, ccEntrys: ccs, bccEntrys: bccs, subject: subject, textContent: body, htmlContent: nil)
+ let outMail = OutgoingMail(toAddresses: tos, ccAddresses: ccs, bccAddresses: bccs, subject: subject, textContent: body, htmlContent: nil)
if let data = outMail.plainData {
// Test parsing!
let incMail = IncomingMail(rawData: data, uID: 0, folderPath: "INBOX", flags: MCOMessageFlag.init(rawValue: 0))
@@ -182,7 +182,7 @@ n1O3czuVl7rPXrJn0A/MVI2ReKOQeIAYMg==
https certs will be valid – Microsoft signed.
"""
body = body.replacingOccurrences(of: "\n", with: "\r\n")
- let outMail = OutgoingMail(toEntrys: tos, ccEntrys: ccs, bccEntrys: bccs, subject: subject, textContent: body, htmlContent: nil)
+ let outMail = OutgoingMail(toAddresses: tos, ccAddresses: ccs, bccAddresses: bccs, subject: subject, textContent: body, htmlContent: nil)
if let data = outMail.plainData {
// Test parsing!
let incMail = IncomingMail(rawData: data, uID: 0, folderPath: "INBOX", flags: MCOMessageFlag.init(rawValue: 0))
@@ -200,7 +200,7 @@ n1O3czuVl7rPXrJn0A/MVI2ReKOQeIAYMg==
let subject = "subject"
let body = "body"
_ = createPGPUser(adr: encAdr, name: encAdr)
- let outMail = OutgoingMail(toEntrys: [userAdr], ccEntrys: [], bccEntrys: [], subject: subject, textContent: body, htmlContent: nil)
+ let outMail = OutgoingMail(toAddresses: [userAdr], ccAddresses: [], bccAddresses: [], subject: subject, textContent: body, htmlContent: nil)
if let data = outMail.pgpData{
let incMail = IncomingMail(rawData: data, uID: 1, folderPath: "INBOX", flags: MCOMessageFlag.init(rawValue: 0))
let b = incMail.export().body
@@ -222,7 +222,7 @@ n1O3czuVl7rPXrJn0A/MVI2ReKOQeIAYMg==
let subject = "subject"
let body = "body"
_ = createPGPUser(adr: encAdr, name: encAdr)
- let outMail = OutgoingMail(toEntrys: [plainAdr, userAdr], ccEntrys: [], bccEntrys: [], subject: subject, textContent: body, htmlContent: nil)
+ let outMail = OutgoingMail(toAddresses: [plainAdr, userAdr], ccAddresses: [], bccAddresses: [], subject: subject, textContent: body, htmlContent: nil)
if let data = outMail.pgpData {
let incMail = IncomingMail(rawData: data, uID: 2, folderPath: "INBOX", flags: MCOMessageFlag.init(rawValue: 0))
storeAndTestMail(mails: [incMail], testFunc: {mail in
@@ -275,11 +275,11 @@ n1O3czuVl7rPXrJn0A/MVI2ReKOQeIAYMg==
func receiveImportKeyMail(file: String, keyID: String, pw: String?, encMail: Bool, attached: Bool = false){
let bundle = Bundle(for: type(of: self))
if let url = bundle.url(forResource: file, withExtension: "asc"), let keyData = try? Data(contentsOf: url), let body = String(data: keyData, encoding: .utf8) {
- var mail = OutgoingMail(toEntrys: [userAdr], ccEntrys: [], bccEntrys: [], subject: "New secret key", textContent: body, htmlContent: nil)
+ var mail = OutgoingMail(toAddresses: [userAdr], ccAddresses: [], bccAddresses: [], subject: "New secret key", textContent: body, htmlContent: nil)
if attached, let attachment = MCOAttachment(data: keyData, filename: "secretKey.asc") {
attachment.mimeType = ""
attachment.charset = "UTF-8"
- mail = OutgoingMail(toEntrys: [userAdr], ccEntrys: [], bccEntrys: [], subject: "New attached secret key", textContent: MailTest.body, htmlContent: nil, textparts: 0, sendEncryptedIfPossible: false, attachments: [attachment])
+ mail = OutgoingMail(toAddresses: [userAdr], ccAddresses: [], bccAddresses: [], subject: "New attached secret key", textContent: MailTest.body, htmlContent: nil, textparts: 0, sendEncryptedIfPossible: false, attachments: [attachment])
}
var data = mail.plainData
if encMail {
@@ -401,7 +401,7 @@ n1O3czuVl7rPXrJn0A/MVI2ReKOQeIAYMg==
let mailData = MailTest.loadMail(name: "signedSMIMEfromMac")
let incMail = IncomingMail(rawData: mailData, uID: 4, folderPath: "INBOX", flags: MCOMessageFlag.init(rawValue: 0))
storeAndTestMail(mails: [incMail], testFunc: {mail in
- print("\(mail.subject) \(mail.encryptionState) \(mail.signatureState) keyid: \(mail.signatureKeyID)")
+ print("\(mail.subject) \(mail.encryptionState) \(mail.signatureState) keyid: \(String(describing: mail.signatureKeyID))")
XCTAssertEqual(mail.encryptionState, .NoEncryption)
XCTAssertEqual(mail.signatureState, .ValidSignature)
})
@@ -428,7 +428,7 @@ n1O3czuVl7rPXrJn0A/MVI2ReKOQeIAYMg==
}
let incMail = IncomingMail(rawData: mailData, uID: 4, folderPath: "INBOX", flags: MCOMessageFlag.init(rawValue: 0))
storeAndTestMail(mails: [incMail], testFunc: {mail in
- print("\(mail.subject) \(mail.encryptionState) \(mail.signatureState) keyid: \(mail.signatureKeyID)")
+ print("\(mail.subject) \(mail.encryptionState) \(mail.signatureState) keyid: \(String(describing: mail.signatureKeyID))")
if let sig = sigState, sig == .ValidSignature{
XCTAssertEqual(mail.signatureKey?.fingerprint, alice)
}
diff --git a/enzevalos_iphoneTests/SMIMEMailTest.swift b/enzevalos_iphoneTests/SMIMEMailTest.swift
index 3388bf5f673ef3495e84a965bb1bec5508f2b77c..cc136f61b182caed92b671753f6963c9c6a90e22 100644
--- a/enzevalos_iphoneTests/SMIMEMailTest.swift
+++ b/enzevalos_iphoneTests/SMIMEMailTest.swift
@@ -334,7 +334,7 @@ OxeGuSvQoBUdP50ZspBBrf2+simuJLKMQ8kVXx8TuJqXe1FQPvFWDX5lBAf57BET
PkfA6mR7rtcyIbHi34tfkCv/qolV3QivMHov0IJpRyNO
-----END ENCRYPTED PRIVATE KEY-----
"""
- let provider = PersitentDataProvider()
+ let provider = PersistentDataProvider()
var userAdr = "bob@enzevalos.de"
@@ -401,7 +401,7 @@ PkfA6mR7rtcyIbHi34tfkCv/qolV3QivMHov0IJpRyNO
let fp = smimeObj.importCertForAddress(cert: test_key_other, addr: otherAddr)
let createExpectation = expectation(description: "Create public key record!")
let property = PublicKeyProperties(fingerprint: fp, cryptoProtocol: .SMIME, origin: .FileTransfer, preferEncryption: nil, lastSeenInAutocryptHeader: nil, lastSeenSignedMail: nil, secretKeyProperty: nil, usedAddresses: [AddressProperties(email: otherAddr)])
- PersitentDataProvider.dataProvider.importNewData(from: [property], completionHandler: {error in
+ PersistentDataProvider.dataProvider.importNewData(from: [property], completionHandler: {error in
if let error = error {
XCTFail("Error while creating a new key: \(error)")
}
@@ -412,7 +412,7 @@ PkfA6mR7rtcyIbHi34tfkCv/qolV3QivMHov0IJpRyNO
}
func testCreateEncSMIMEMail() {
- let mail = OutgoingMail(toEntrys: [userAdr], ccEntrys: [], bccEntrys: [], subject: "encrypted smime mail", textContent: "Hello world", htmlContent: nil)
+ let mail = OutgoingMail(toAddresses: [userAdr], ccAddresses: [], bccAddresses: [], subject: "encrypted smime mail", textContent: "Hello world", htmlContent: nil)
guard let data = mail.createEncSMIMEData() else {
XCTFail("No signed mail...")
return
@@ -429,7 +429,7 @@ PkfA6mR7rtcyIbHi34tfkCv/qolV3QivMHov0IJpRyNO
func testCreateSignedSMIMEMail() {
- let mail = OutgoingMail(toEntrys: [otherAddr], ccEntrys: [], bccEntrys: [], subject: "signed smime mail", textContent: "Hello world", htmlContent: nil)
+ let mail = OutgoingMail(toAddresses: [otherAddr], ccAddresses: [], bccAddresses: [], subject: "signed smime mail", textContent: "Hello world", htmlContent: nil)
guard let data = mail.createSignedSMIMEData() else {
XCTFail("No signed mail...")
return
diff --git a/enzevalos_iphoneTests/phishing/MailComparisonTests.swift b/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
index bf017274fd92f27d75eb83b4951c143e9354b0be..0dcb8f8dfa29d0afa76d15883ea8fcda312722d7 100644
--- a/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
+++ b/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
@@ -26,7 +26,7 @@ class MailComparisonTests: XCTestCase {
var user_3_2 = AddressProperties(email: "david@1234.com", name: "david")
private func deleteAll() {
- let provider = PersitentDataProvider()
+ let provider = PersistentDataProvider()
let deleteExpectation = expectation(description: "Delete all data!")
provider.deleteAll(completionHandler: {error in
if let error = error {
@@ -66,9 +66,9 @@ class MailComparisonTests: XCTestCase {
if let decryptedBody = cryptoObject?.decryptedText {
body = decryptedBody
}
- let mail = MailProperties(messageID: "\(id)", subject: subject, date: date, flags: Int16(flags.rawValue), from: from, to: to, cc: cc, bcc: bcc, folder: folder, body: body, attachments: [], signatureState: sigState.rawValue, encryptionState: encState.rawValue, signatureKey: nil, decryptionKey: nil, autocryptHeaderKey: [], attachedPublicKeys: [], attachedSecretKeys: [])
+ let mail = MailProperties(messageID: "\(id)", uid: UInt64(arc4random()), subject: subject, date: date, flags: Int16(flags.rawValue), from: from, to: to, cc: cc, bcc: bcc, folder: folder, body: body, attachments: [], signatureState: sigState.rawValue, encryptionState: encState.rawValue, signatureKey: nil, decryptionKey: nil, autocryptHeaderKey: [], attachedPublicKeys: [], attachedSecretKeys: [])
- PersitentDataProvider.dataProvider.importNewData(from: [mail], completionHandler: {
+ PersistentDataProvider.dataProvider.importNewData(from: [mail], completionHandler: {
error in
print("Done!")
})