From 229d470bf89e5c8cb81d4ba4e966da027afacca1 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@virtual-artz.de>
Date: Thu, 22 Mar 2018 15:05:56 +0100
Subject: [PATCH] Added default parameter values to ephemeralMail
---
enzevalos_iphone/About/AboutViewController.swift | 2 +-
enzevalos_iphone/ContactViewController.swift | 4 ++--
enzevalos_iphone/EphemeralMail.swift | 2 +-
enzevalos_iphone/InviteFriendViewController.swift | 2 +-
enzevalos_iphone/ReadViewController.swift | 2 +-
enzevalos_iphone/SendViewController.swift | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/enzevalos_iphone/About/AboutViewController.swift b/enzevalos_iphone/About/AboutViewController.swift
index 23e1221e..e5437d67 100644
--- a/enzevalos_iphone/About/AboutViewController.swift
+++ b/enzevalos_iphone/About/AboutViewController.swift
@@ -36,7 +36,7 @@ class AboutViewController: UIViewController {
let answerTo = sender as? String ?? "" // TODO: Convert String into MailAddress(?)
- let answerMail = EphemeralMail(to: NSSet.init(array: [answerTo]), cc: NSSet.init(array: []), bcc: [], date: Date(), subject: "", body: "", uid: 0, predecessor: nil) // TODO: are these the best values?
+ let answerMail = EphemeralMail(to: [answerTo])
controller.prefilledMail = answerMail
}
diff --git a/enzevalos_iphone/ContactViewController.swift b/enzevalos_iphone/ContactViewController.swift
index 134a09d2..1a89d4c1 100644
--- a/enzevalos_iphone/ContactViewController.swift
+++ b/enzevalos_iphone/ContactViewController.swift
@@ -177,7 +177,7 @@ class ContactViewController: UIViewController {
tableView.selectRow(at: myPath, animated: false, scrollPosition: .none)
performSegue(withIdentifier: "otherRecord", sender: nil)
} else if sender.titleLabel?.text == NSLocalizedString("invite", comment: "invite contact") {
- let mail = EphemeralMail(to: NSSet.init(array: keyRecord!.addresses), cc: NSSet.init(), bcc: NSSet.init(), date: Date(), subject: NSLocalizedString("inviteSubject", comment: ""), body: String(format: NSLocalizedString("inviteText", comment: ""),StudySettings.studyID), uid: 0, predecessor: nil)
+ let mail = EphemeralMail(to: NSSet.init(array: keyRecord!.addresses), subject: NSLocalizedString("inviteSubject", comment: ""), body: String(format: NSLocalizedString("inviteText", comment: ""),StudySettings.studyID))
performSegue(withIdentifier: "newMail", sender: mail)
} else if sender.titleLabel?.text == NSLocalizedString("verifyNow", comment: "Verify now") {
AppUtility.lockOrientation(.portrait, andRotateTo: .portrait)
@@ -208,7 +208,7 @@ class ContactViewController: UIViewController {
} else {
let indexPath = tableView.indexPathForSelectedRow
if indexPath!.row < keyRecord!.ezContact.getMailAddresses().count {
- let prefilledMail = EphemeralMail(to: [keyRecord!.ezContact.getMailAddresses()[indexPath!.row].mailAddress], cc: [], bcc: [], date: Date(), subject: nil, body: UserManager.loadUserSignature(), uid: 0, predecessor: nil)
+ let prefilledMail = EphemeralMail(to: [keyRecord!.ezContact.getMailAddresses()[indexPath!.row].mailAddress])
controller.prefilledMail = prefilledMail
}
}
diff --git a/enzevalos_iphone/EphemeralMail.swift b/enzevalos_iphone/EphemeralMail.swift
index 80378c02..cf309ed6 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, subject: String?, body: String?, uid: UInt64, 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) {
self.cc = cc
self.bcc = bcc
self.to = to
diff --git a/enzevalos_iphone/InviteFriendViewController.swift b/enzevalos_iphone/InviteFriendViewController.swift
index be646adf..fe655503 100755
--- a/enzevalos_iphone/InviteFriendViewController.swift
+++ b/enzevalos_iphone/InviteFriendViewController.swift
@@ -231,7 +231,7 @@ class InviteFriendViewController: UIViewController, UITableViewDataSource, UITab
let subject = NSLocalizedString("inviteSubject", comment: "Subject for the invitation mail")
- let answerMail = EphemeralMail(to: NSSet.init(array: sendTo), cc: [], bcc: [], date: Date(), subject: subject, body: body, uid: 0, predecessor: nil)
+ let answerMail = EphemeralMail(to: NSSet.init(array: sendTo), subject: subject, body: body)
controller.prefilledMail = answerMail
}
diff --git a/enzevalos_iphone/ReadViewController.swift b/enzevalos_iphone/ReadViewController.swift
index 341930f5..b4076196 100644
--- a/enzevalos_iphone/ReadViewController.swift
+++ b/enzevalos_iphone/ReadViewController.swift
@@ -473,7 +473,7 @@ class ReadViewController: UITableViewController {
if let controller = navigationController?.topViewController as? SendViewController, let mail = mail {
controller.sendViewDelegate = self
if isDraft {
- let prefillMail = EphemeralMail.init(to: mail.to, cc: mail.cc ?? NSSet.init(), bcc: mail.bcc ?? NSSet.init(), date: Date.init(), subject: mail.subject, body: mail.body, uid: mail.uid, predecessor: mail.predecessor)
+ let prefillMail = EphemeralMail.init(to: mail.to, cc: mail.cc ?? NSSet.init(), bcc: mail.bcc ?? NSSet.init(), subject: mail.subject, body: mail.body, uid: mail.uid, predecessor: mail.predecessor)
controller.prefilledMail = prefillMail
return
}
diff --git a/enzevalos_iphone/SendViewController.swift b/enzevalos_iphone/SendViewController.swift
index a47b9ce3..558948f5 100644
--- a/enzevalos_iphone/SendViewController.swift
+++ b/enzevalos_iphone/SendViewController.swift
@@ -292,7 +292,7 @@ class SendViewController: UIViewController {
}
let body = String(format: NSLocalizedString("inviteText", comment: "Body for the invitation mail"),StudySettings.studyID)
- let mail = EphemeralMail(to: NSSet.init(array: to), cc: NSSet.init(array: cc), bcc: NSSet.init(), date: Date(), subject: NSLocalizedString("inviteSubject", comment: "Subject for the invitation mail"), body: body, uid: 0, predecessor: nil)
+ let mail = EphemeralMail(to: NSSet.init(array: to), cc: NSSet.init(array: cc), subject: NSLocalizedString("inviteSubject", comment: "Subject for the invitation mail"), body: body)
controller.prefilledMail = mail
--
GitLab