From 301e25f9a14d9df14b74ddd68581d01028fc7975 Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Fri, 24 May 2019 11:42:17 -0700
Subject: [PATCH] improve autocrypt remove print
---
enzevalos_iphone/Autocrypt.swift | 2 +-
enzevalos_iphone/ItunesHandler.swift | 2 --
enzevalos_iphone/OutgoingMail.swift | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/enzevalos_iphone/Autocrypt.swift b/enzevalos_iphone/Autocrypt.swift
index 65156950..e2a4b5d1 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 7ddda4a0..d3858e42 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 c79f973a..f37edede 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 {
--
GitLab