Removed deprecated character view from strings

EnzevalosContact+CoreDataClass.swift

@@ -43,17 +43,17 @@ open class EnzevalosContact: NSManagedObject, Contact, Comparable {
         var name = String()
 
         if let cnc = cnContact {
-            if cnc.givenName.characters.count > 0 {
+            if cnc.givenName.count > 0 {
                 name += cnc.givenName
             }
-            if cnc.familyName.characters.count > 0 {
-                if name.characters.count > 0 {
+            if cnc.familyName.count > 0 {
+                if name.count > 0 {
                     name += " "
                 }
                 name += cnc.familyName
             }
         }
-        if name.characters.count > 0 {
+        if name.count > 0 {
             return name
         } else {
             return nil
@@ -174,7 +174,7 @@ open class EnzevalosContact: NSManagedObject, Contact, Comparable {
         let con = CNMutableContact()
         let name = self.displayname
         if let n = name {
-            let nameArray = n.characters.split(separator: " ").map(String.init)
+            let nameArray = n.split(separator: " ").map(String.init)
             switch nameArray.count {
             case 1:
                 con.givenName = nameArray.first!

PersistentMail +CoreDataClass.swift

@@ -91,8 +91,8 @@ open class PersistentMail: NSManagedObject, Mail {
 
         if message != nil {
             message = message!.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
-            if message!.characters.count > 50 {
-                message = message!.substring(to: message!.characters.index(message!.startIndex, offsetBy: 50))
+            if message!.count > 50 {
+                message = message!.substring(to: message!.index(message!.startIndex, offsetBy: 50))
             }
             let messageArray = message!.components(separatedBy: "\n")
             return messageArray.joined(separator: " ")

enzevalos_iphone/CNContactExtension.swift

@@ -18,16 +18,16 @@ extension CNContact: Contact {
     public var name: String {
         var name: String
         name = String()
-        if self.givenName.characters.count > 0 {
+        if self.givenName.count > 0 {
             name += self.givenName
         }
-        if self.familyName.characters.count > 0 {
-            if name.characters.count > 0 {
+        if self.familyName.count > 0 {
+            if name.count > 0 {
                 name += " "
             }
             name += self.familyName
         }
-        if name.characters.count == 0 && self.emailAddresses.count > 0 {
+        if name.count == 0 && self.emailAddresses.count > 0 {
             let adr = (self.emailAddresses.first?.value)! as String
             return adr
         }

enzevalos_iphone/Contact.swift

@@ -21,9 +21,9 @@ extension Contact {
     private func makeImageFromName(_ name: String) -> UIImage {
         var text: NSAttributedString
         var tag = String()
-        if name.characters.count > 0 {
+        if name.count > 0 {
             let seperated = name.components(separatedBy: " ")
-            tag = seperated.map({if let a = $0.characters.first { return "\(a)" }; return "" }).joined()
+            tag = seperated.map({if let a = $0.first { return "\(a)" }; return "" }).joined()
         }
 
         text = NSAttributedString(string: tag.uppercased(), attributes: [NSForegroundColorAttributeName: UIColor.white, NSFontAttributeName: UIFont.systemFont(ofSize: 32.2)])

enzevalos_iphone/ExportCells.swift

@@ -31,7 +31,7 @@ class ExportSecretCell: UITableViewCell {
     @IBOutlet weak var secretRow3: UILabel!
     
     func setSecretToLabels(secret: String) {
-        if secret.characters.count == 44 {
+        if secret.count == 44 {
             let cut1 = secret.index(secret.startIndex, offsetBy: 15)
             let cut2 = secret.index(secret.startIndex, offsetBy: 30)
             secretRow1.text = secret.substring(to: cut1)

enzevalos_iphone/MailHandler.swift

@@ -93,7 +93,7 @@ class AutocryptContact {
                         pref = value.trimmingCharacters(in: .whitespacesAndNewlines)
                         break
                     case KEY:
-                        if value.characters.count > 0 {
+                        if value.count > 0 {
                             key = value
                         }
                         break
@@ -127,7 +127,7 @@ class AutocryptContact {
     }
 
     func toString() -> String {
-        return "Addr: \(addr) | type: \(type) | encryption? \(prefer_encryption) key size: \(key.characters.count)"
+        return "Addr: \(addr) | type: \(type) | encryption? \(prefer_encryption) key size: \(key.count)"
     }
 }
 

enzevalos_iphone/ReadViewController.swift

@@ -370,8 +370,6 @@ class ReadViewController: UITableViewController {
             if let name = mail.from.contact?.nameOptional {
                 senderTokenField.delegate?.tokenField!(senderTokenField, didEnterText: name, mail: mail.from.mailAddress)
             } else {
-                let name: String = mail.from.mailAddress
-                print("MYNAME IS: \(name)")
                 senderTokenField.delegate?.tokenField!(senderTokenField, didEnterText: mail.from.mailAddress, mail: mail.from.mailAddress)
             }
 
@@ -406,7 +404,7 @@ class ReadViewController: UITableViewController {
             receivedTime.text = mail.timeString
 
             if let subj = mail.subject {
-                if subj.trimmingCharacters(in: CharacterSet.whitespaces).characters.count > 0 {
+                if subj.trimmingCharacters(in: CharacterSet.whitespaces).count > 0 {
                     subject.text = subj
                 } else {
                     subject.text = NSLocalizedString("SubjectNo", comment: "This mail has no subject")