From b0225082c941fb65e53d17d1dd6ed240c9d29b3f Mon Sep 17 00:00:00 2001
From: jakob <jakob.bode@fu-berlin.de>
Date: Thu, 14 Jun 2018 17:29:02 +0200
Subject: [PATCH] some (temporary) fixes
---
enzevalos_iphone/DataHandler.swift | 2 +-
enzevalos_iphone/EphemeralMail.swift | 2 +-
enzevalos_iphone/MailHandler.swift | 2 +-
enzevalos_iphone/Onboarding.swift | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/enzevalos_iphone/DataHandler.swift b/enzevalos_iphone/DataHandler.swift
index 469e732b..1d8a01f2 100644
--- a/enzevalos_iphone/DataHandler.swift
+++ b/enzevalos_iphone/DataHandler.swift
@@ -226,7 +226,7 @@ class DataHandler {
sk = NSEntityDescription.insertNewObject(forEntityName: "SecretKey", into: managedObjectContext) as! SecretKey
sk.keyID = keyID
sk.obsolete = false
- sk.importedDate = Date () as NSDate
+ sk.importedDate = Date() //as NSDate
UserManager.storeUserValue(keyID as AnyObject, attribute: Attribute.prefSecretKeyID)
let adr = UserManager.loadUserValue(Attribute.userAddr) as! String
let name = UserManager.loadUserValue(Attribute.accountname) as? String ?? adr
diff --git a/enzevalos_iphone/EphemeralMail.swift b/enzevalos_iphone/EphemeralMail.swift
index cf309ed6..a70af7a1 100644
--- a/enzevalos_iphone/EphemeralMail.swift
+++ b/enzevalos_iphone/EphemeralMail.swift
@@ -19,7 +19,7 @@ open class EphemeralMail: Mail {
public var uid: UInt64
public var predecessor: PersistentMail?
- public init(to: NSSet = [], cc: NSSet = [], bcc: NSSet = [], date: Date = Date(), subject: String? = nil, body: String? = UserManager.loadUserSignature(), uid: UInt64 = 0, predecessor: PersistentMail? = nil) {
+ public init(to: NSSet = [], cc: NSSet = [], bcc: NSSet = [], date: Date = Date(), subject: String? = nil, body: String? = ""/*UserManager.loadUserSignature()*/, uid: UInt64 = 0, predecessor: PersistentMail? = nil) {
self.cc = cc
self.bcc = bcc
self.to = to
diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index 4ac83abd..52f9f086 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -1004,7 +1004,7 @@ class MailHandler {
let end = content.range(of: "-----END PGP PRIVATE KEY BLOCK-----") {
let s = start.lowerBound
let e = end.upperBound
- let sk = content[s..<e]
+ let sk = String(content[s..<e])
return sk
}
}
diff --git a/enzevalos_iphone/Onboarding.swift b/enzevalos_iphone/Onboarding.swift
index 6713ec51..a8c99471 100644
--- a/enzevalos_iphone/Onboarding.swift
+++ b/enzevalos_iphone/Onboarding.swift
@@ -44,9 +44,9 @@ class Onboarding: NSObject {
static let font = UIFont.init(name: "Helvetica-Light", size: 28)
static let padding: CGFloat = 30
- static var doWhenDone: () -> () = { Void in }
- static var fail: () -> () = { Void in }
- static var work: () -> () = { Void in }
+ static var doWhenDone: () -> () = { () -> () in }
+ static var fail: () -> () = { () -> () in }
+ static var work: () -> () = { () -> () in }
static var credentialFails = 0
@@ -279,7 +279,7 @@ class Onboarding: NSObject {
Onboarding.password.returnKeyType = .done
password.text = UserManager.loadUserValue(.userPW) as? String
mailaddress.text = UserManager.loadUserValue(.userAddr) as? String
- doWhenDone = { Void in }
+ doWhenDone = { () -> () in }
let email = OnboardingContentViewController.content(withTitle: nil, body: NSLocalizedString("InsertMailAddressAndPassword", comment: ""), videoURL: nil, inputView: credentials, buttonText: nil, actionBlock: callback)
username = UITextField.init()
--
GitLab