Skip to content
Snippets Groups Projects
Commit 317f0f2b authored by Joscha's avatar Joscha
Browse files

Removed legacy toField from SendView; Fix issue #215

parent de5d48ec
No related branches found
No related tags found
No related merge requests found
...@@ -208,7 +208,8 @@ class ContactViewController: UIViewController { ...@@ -208,7 +208,8 @@ class ContactViewController: UIViewController {
} else { } else {
let indexPath = tableView.indexPathForSelectedRow let indexPath = tableView.indexPathForSelectedRow
if indexPath!.row < keyRecord!.ezContact.getMailAddresses().count { if indexPath!.row < keyRecord!.ezContact.getMailAddresses().count {
controller.toField = keyRecord!.ezContact.getMailAddresses()[indexPath!.row].mailAddress let prefilledMail = EphemeralMail(to: [keyRecord!.ezContact.getMailAddresses()[indexPath!.row].mailAddress], cc: [], bcc: [], date: Date(), subject: nil, body: UserManager.loadUserSignature(), uid: 0, predecessor: nil)
controller.prefilledMail = prefilledMail
} }
} }
} }
......
...@@ -52,7 +52,6 @@ class SendViewController: UIViewController { ...@@ -52,7 +52,6 @@ class SendViewController: UIViewController {
var recognizer: UIGestureRecognizer = UIGestureRecognizer.init() var recognizer: UIGestureRecognizer = UIGestureRecognizer.init()
var prefilledMail: EphemeralMail? = nil var prefilledMail: EphemeralMail? = nil
var toField: String? = nil
var sendEncryptedIfPossible = true var sendEncryptedIfPossible = true
var freeTextInviationTitle = StudySettings.freeTextInvitationTitle var freeTextInviationTitle = StudySettings.freeTextInvitationTitle
var freeTextInvitationCall: (() -> (String)) = StudySettings.freeTextInvitationCode var freeTextInvitationCall: (() -> (String)) = StudySettings.freeTextInvitationCode
...@@ -130,10 +129,7 @@ class SendViewController: UIViewController { ...@@ -130,10 +129,7 @@ class SendViewController: UIViewController {
textView.text.append(UserManager.loadUserSignature()) textView.text.append(UserManager.loadUserSignature())
} }
if let to = toField { if let prefilledMail = prefilledMail {
let ezCon = DataHandler.handler.getContactByAddress(to)
toText.delegate?.tokenField!(toText, didEnterText: ezCon.name, mail: to)
} else if let prefilledMail = prefilledMail {
for case let mail as MailAddress in prefilledMail.to { for case let mail as MailAddress in prefilledMail.to {
if mail.mailAddress != UserManager.loadUserValue(Attribute.userAddr) as! String { if mail.mailAddress != UserManager.loadUserValue(Attribute.userAddr) as! String {
toText.delegate?.tokenField!(toText, didEnterText: mail.mailAddress) toText.delegate?.tokenField!(toText, didEnterText: mail.mailAddress)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment