From 70f274598c362c4690c64c01ffe8507d0ce9d16d Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 26 Oct 2018 14:19:04 -0400
Subject: [PATCH] Avoid deadlocks in contact manager.

---
 SignalMessaging/contacts/OWSContactsManager.m            | 8 ++++----
 SignalServiceKit/src/Protocols/ContactsManagerProtocol.h | 4 ++--
 SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m
index d98a329a6..5a3158bc7 100644
--- a/SignalMessaging/contacts/OWSContactsManager.m
+++ b/SignalMessaging/contacts/OWSContactsManager.m
@@ -749,7 +749,7 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan
     return [self cachedContactNameForRecipientId:recipientId transaction:transaction];
 }
 
-- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
+- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
 {
     OWSAssertDebug(recipientId.length > 0);
 
@@ -767,8 +767,8 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan
     return displayName;
 }
 
-- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
-                                        transaction:(YapDatabaseReadTransaction *)transaction
+- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
+                                transaction:(YapDatabaseReadTransaction *)transaction
 {
     OWSAssertDebug(recipientId.length > 0);
     OWSAssertDebug(transaction);
@@ -973,7 +973,7 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan
     if (profileName.length > 0) {
         NSString *numberAndProfileNameFormat = NSLocalizedString(@"PROFILE_NAME_AND_PHONE_NUMBER_LABEL_FORMAT",
             @"Label text combining the phone number and profile name separated by a simple demarcation character. "
-            @"Phone number should be masost prominent. '%1$@' is replaced with {{phone number}} and '%2$@' is replaced "
+            @"Phone number should be most prominent. '%1$@' is replaced with {{phone number}} and '%2$@' is replaced "
             @"with {{profile name}}");
 
         NSString *numberAndProfileName =
diff --git a/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h b/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
index bbb042786..1ac159d43 100644
--- a/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
+++ b/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
@@ -14,8 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol ContactsManagerProtocol <NSObject>
 
 - (NSString *)displayNameForPhoneIdentifier:(nullable NSString *)recipientId;
-- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
-                                        transaction:(YapDatabaseReadTransaction *)transaction;
+- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)recipientId
+                                transaction:(YapDatabaseReadTransaction *)transaction;
 - (NSArray<SignalAccount *> *)signalAccounts;
 
 - (BOOL)isSystemContact:(NSString *)recipientId;
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m b/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m
index 55dbf5fe9..08e15592b 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m
+++ b/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m
@@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation OWSFakeContactsManager
 
-- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)phoneNumber
+- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)phoneNumber
 {
     return @"Fake name";
 }