From af977ca409e251e94caefd6b405e0c6a65513ea4 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 19 Jun 2018 09:17:50 -0400
Subject: [PATCH] Don't cache CNContact.

---
 .../AddContactShareToExistingContactViewController.swift    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift
index 3ba404a14..c272d9f0e 100644
--- a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift
+++ b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift
@@ -60,13 +60,11 @@ class AddContactShareToExistingContactViewController: ContactsPicker, ContactsPi
 
         let contactsManager = Environment.current().contactsManager
         guard let oldCNContact = contactsManager?.cnContact(withId: oldContact.cnContactId) else {
-            // TODO: Alert?
-            Logger.warn("\(logTag) could not load old CNContact.")
+            owsFail("\(logTag) could not load old CNContact.")
             return
         }
         guard let newCNContact = OWSContacts.systemContact(for: self.contactShare.dbRecord, imageData: self.contactShare.avatarImageData) else {
-            // TODO: Alert?
-            Logger.warn("\(logTag) could not load new CNContact.")
+            owsFail("\(logTag) could not load new CNContact.")
             return
         }
         merge(oldCNContact: oldCNContact, newCNContact: newCNContact)