Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
enzevalos_iphone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
enzevalos
enzevalos_iphone
Commits
317f0f2b
Commit
317f0f2b
authored
7 years ago
by
Joscha
Browse files
Options
Downloads
Patches
Plain Diff
Removed legacy toField from SendView; Fix issue
#215
parent
de5d48ec
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
enzevalos_iphone/ContactViewController.swift
+2
-1
2 additions, 1 deletion
enzevalos_iphone/ContactViewController.swift
enzevalos_iphone/SendViewController.swift
+1
-5
1 addition, 5 deletions
enzevalos_iphone/SendViewController.swift
with
3 additions
and
6 deletions
enzevalos_iphone/ContactViewController.swift
+
2
−
1
View file @
317f0f2b
...
@@ -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
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
enzevalos_iphone/SendViewController.swift
+
1
−
5
View file @
317f0f2b
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment