From 356f64cb0310d505ee3fb35f5da5315c16b43a3a Mon Sep 17 00:00:00 2001
From: jakobsbode <jakobsbode@mi.fu-berlin.de>
Date: Wed, 14 Jun 2017 15:49:46 +0200
Subject: [PATCH] show contacts, who are not in contact book in the
fast-suggestions in sendView too
---
enzevalos_iphone/AddressHandler.swift | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/enzevalos_iphone/AddressHandler.swift b/enzevalos_iphone/AddressHandler.swift
index d55c423b..49cca945 100644
--- a/enzevalos_iphone/AddressHandler.swift
+++ b/enzevalos_iphone/AddressHandler.swift
@@ -96,15 +96,16 @@ class AddressHandler {
}
}
if !insertedEntry {
+ var addrType: UIImage? = nil
+
+ if address.label.label == "_$!<Work>!$_" {
+ addrType = UIImage(named: "work2_white")!
+ }
+ if address.label.label == "_$!<Home>!$_" {
+ addrType = UIImage(named: "home2_white")!
+ }
if let cn = con.cnContact {
- var addrType: UIImage? = nil
-
- if address.label.label == "_$!<Work>!$_" {
- addrType = UIImage(named: "work2_white")!
- }
- if address.label.label == "_$!<Home>!$_" {
- addrType = UIImage(named: "home2_white")!
- }
+
var color = cn.getColor()
if cn.thumbnailImageData != nil {
@@ -117,6 +118,11 @@ class AddressHandler {
list.append(entry)
localInserted.append(address.mailAddress)
}
+ else {
+ var entry = (con.ezContact.getImageOrDefault(), con.ezContact.displayname ?? address.mailAddress, address.mailAddress, addrType, con.ezContact.getColor())
+ list.append(entry)
+ localInserted.append(address.mailAddress)
+ }
}
}
@@ -136,7 +142,7 @@ class AddressHandler {
return list
}
-
+
static func proveAddress(_ s: NSString) -> Bool {
if addresses.contains((s as String).lowercased()) {
return true
--
GitLab