diff --git a/enzevalos_iphone/Autocrypt.swift b/enzevalos_iphone/Autocrypt.swift index 651569507a6e104ca765907fbbb5896e284cd906..e2a4b5d17e12688ebe8070e885447d8eea664995 100644 --- a/enzevalos_iphone/Autocrypt.swift +++ b/enzevalos_iphone/Autocrypt.swift @@ -110,7 +110,7 @@ class Autocrypt { if let key = pgp.exportKey(id: id, isSecretkey: false, autocrypt: true) { var string = "\(ADDR)=" + adr string = string + "; \(ENCRYPTION)=\(encPref.name)" - string = string + "; \(KEY)= \n" + key + string = string + "; \(KEY)=" + key builder.header.setExtraHeaderValue(string, forName: AUTOCRYPTHEADER) } } diff --git a/enzevalos_iphone/ItunesHandler.swift b/enzevalos_iphone/ItunesHandler.swift index 7ddda4a09996e3629409e0d3446da09555588531..d3858e42b633d1a89cb23b5fd358c5e1a778a1e9 100644 --- a/enzevalos_iphone/ItunesHandler.swift +++ b/enzevalos_iphone/ItunesHandler.swift @@ -42,7 +42,6 @@ class ItunesKeyHandling { var creationDate = Date() if let attrs = try? fileManager.attributesOfItem(atPath: url.path) as NSDictionary, let date = attrs.fileCreationDate() { creationDate = date - print(creationDate) } keys.append(contentsOf: pgp.readKeys(data: data,importDate: creationDate)) } @@ -58,7 +57,6 @@ class ItunesKeyHandling { var keys: [URL] = [] let dirs = fileManager.urls(for: .documentDirectory, in: .userDomainMask) for url in dirs { - print(url) if let files = try? fileManager.contentsOfDirectory(at: url, includingPropertiesForKeys: nil, options: .skipsHiddenFiles) { let keyFiles = files.filter{ $0.pathExtension == "asc"} keys.append(contentsOf: keyFiles) diff --git a/enzevalos_iphone/OutgoingMail.swift b/enzevalos_iphone/OutgoingMail.swift index c79f973ab8c53cb39141c2a6c57e582fe5663066..f37ededec8a637a2c5a7f87c1dfb1ce1fe788fbd 100644 --- a/enzevalos_iphone/OutgoingMail.swift +++ b/enzevalos_iphone/OutgoingMail.swift @@ -24,7 +24,7 @@ class OutgoingMail { private let ccEntrys: [MCOAddress] private let bccEntrys: [MCOAddress] var username = UserManager.loadUserValue(Attribute.accountname) as? String ?? "" - var useraddr = UserManager.loadUserValue(Attribute.userAddr) as? String ?? "" + var useraddr = (UserManager.loadUserValue(Attribute.userAddr) as? String ?? "").lowercased() var userDisplayName = UserManager.loadUserValue(Attribute.userDisplayName) as? String var sender: MCOAddress {