Merge pull request #354 from Infomaniak/fix-contact-color

Prevent force unwrap
Infomaniak · Oct 12, 2022 · dff0f74 · dff0f74
2 parents e2ba597 + 5f646dd
commit dff0f74
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/MailCore/Models/MergedContact.swift b/MailCore/Models/MergedContact.swift
@@ -39,7 +39,14 @@ public class MergedContact {
 
     private let contactFormatter = CNContactFormatter()
 
-    public lazy var color = UIColor(hex: remote!.color) ?? UserDefaults.shared.accentColor.primary.color
+    public lazy var color: UIColor = {
+        if let remoteColorHex = remote?.color,
+           let colorFromHex = UIColor(hex: remoteColorHex) {
+            return colorFromHex
+        } else {
+            return UserDefaults.shared.accentColor.primary.color
+        }
+    }()
 
     public lazy var name: String = {
         if let local = local, let localName = contactFormatter.string(from: local) {