From 5f646dde6d9c9a48fa1e13f07358400a6e3fb9db Mon Sep 17 00:00:00 2001
From: Philippe Weidmann <philippe.weidmann@infomaniak.com>
Date: Wed, 12 Oct 2022 15:38:20 +0200
Subject: [PATCH] Prevent force unwrap

---
 MailCore/Models/MergedContact.swift | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/MailCore/Models/MergedContact.swift b/MailCore/Models/MergedContact.swift
index 98fc09066..556479469 100644
--- 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) {