revert superfluous nil checks and optional return values for DcContact

DcCore/DcCore/DC/Wrapper.swift

@@ -799,6 +799,7 @@ public class DcChat {
                 let image = UIImage(data: data)
                 return image
             } catch {
+                print("failed to load image: \(filename), \(error)")
                 return nil
             }
         }
@@ -1123,60 +1124,52 @@ public class DcContact {
     }
 
     public var displayName: String {
-        guard let contactPointer = contactPointer,
-              let cString = dc_contact_get_display_name(contactPointer) else { return "" }
+        guard let cString = dc_contact_get_display_name(contactPointer) else { return "" }
         let swiftString = String(cString: cString)
         dc_str_unref(cString)
         return swiftString
     }
 
     public var nameNAddr: String {
-        guard let contactPointer = contactPointer,
-              let cString = dc_contact_get_name_n_addr(contactPointer) else { return "" }
+        guard let cString = dc_contact_get_name_n_addr(contactPointer) else { return "" }
         let swiftString = String(cString: cString)
         dc_str_unref(cString)
         return swiftString
     }
 
     public var editedName: String {
-        guard let contactPointer = contactPointer,
-              let cString = dc_contact_get_name(contactPointer) else { return "" }
+        guard let cString = dc_contact_get_name(contactPointer) else { return "" }
         let swiftString = String(cString: cString)
         dc_str_unref(cString)
         return swiftString
     }
 
     public var authName: String {
-        guard let contactPointer = contactPointer,
-              let cString = dc_contact_get_auth_name(contactPointer) else { return "" }
+        guard let cString = dc_contact_get_auth_name(contactPointer) else { return "" }
         let swiftString = String(cString: cString)
         dc_str_unref(cString)
         return swiftString
     }
 
     public var email: String {
-        guard let contactPointer = contactPointer,
-              let cString = dc_contact_get_addr(contactPointer) else { return "" }
+        guard let cString = dc_contact_get_addr(contactPointer) else { return "" }
         let swiftString = String(cString: cString)
         dc_str_unref(cString)
         return swiftString
     }
 
     public var status: String {
-        guard let contactPointer = contactPointer,
-              let cString = dc_contact_get_status(contactPointer) else { return "" }
+        guard let cString = dc_contact_get_status(contactPointer) else { return "" }
         let swiftString = String(cString: cString)
         dc_str_unref(cString)
         return swiftString
     }
 
-    public var isVerified: Bool? {
-        guard let contactPointer = contactPointer else { return  nil }
+    public var isVerified: Bool {
         return dc_contact_is_verified(contactPointer) > 0
     }
 
-    public var isBlocked: Bool? {
-    guard let contactPointer = contactPointer else { return  nil }
+    public var isBlocked: Bool {
         return dc_contact_is_blocked(contactPointer) == 1
     }
 

deltachat-ios/Controller/ContactDetailViewController.swift

@@ -297,8 +297,8 @@ class ContactDetailViewController: UITableViewController {
     }
 
     private func updateBlockContactCell() {
-        blockContactCell.actionTitle = (viewModel.contact.isBlocked ?? false) ? String.localized("menu_unblock_contact") : String.localized("menu_block_contact")
-        blockContactCell.actionColor = (viewModel.contact.isBlocked ?? false) ? SystemColor.blue.uiColor : UIColor.red
+        blockContactCell.actionTitle = viewModel.contact.isBlocked ? String.localized("menu_unblock_contact") : String.localized("menu_block_contact")
+        blockContactCell.actionColor = viewModel.contact.isBlocked ? SystemColor.blue.uiColor : UIColor.red
     }
 
 
@@ -360,7 +360,7 @@ class ContactDetailViewController: UITableViewController {
     }
 
     private func toggleBlockContact() {
-        if viewModel.contact.isBlocked ?? false {
+        if viewModel.contact.isBlocked {
             let alert = UIAlertController(title: String.localized("ask_unblock_contact"), message: nil, preferredStyle: .safeActionSheet)
             alert.addAction(UIAlertAction(title: String.localized("menu_unblock_contact"), style: .default, handler: { _ in
                 self.viewModel.unblockContact()

deltachat-ios/View/ContactCell.swift

@@ -206,8 +206,8 @@ class ContactCell: UITableViewCell {
         ])
     }
 
-    func setVerified(isVerified: Bool?) {
-        avatar.setVerified(isVerified ?? false)
+    func setVerified(isVerified: Bool) {
+        avatar.setVerified(isVerified)
     }
 
     func setImage(_ img: UIImage) {