From 71250281596cdd6a03072d1b4a23aea8ce490eeb Mon Sep 17 00:00:00 2001 From: Russ Shanahan Date: Thu, 1 Dec 2016 21:10:15 -0500 Subject: [PATCH] Rename an OWSContactsManager method From nameStringForPhoneIdentifier To displayNameForPhoneIdentifier * Add nullability descriptions * Fix the mock object to adhere to new nullability rules // FREEBIE --- src/Contacts/Threads/TSContactThread.m | 2 +- src/Messages/OWSDisappearingMessagesJob.m | 2 +- src/Messages/TSGroupModel.m | 4 ++-- src/Messages/TSMessagesManager.m | 4 ++-- src/Protocols/ContactsManagerProtocol.h | 8 ++++---- src/Security/OWSFingerprintBuilder.m | 2 +- tests/TestSupport/Fakes/OWSFakeContactsManager.m | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Contacts/Threads/TSContactThread.m b/src/Contacts/Threads/TSContactThread.m index fe68e6363..446fa6a65 100644 --- a/src/Contacts/Threads/TSContactThread.m +++ b/src/Contacts/Threads/TSContactThread.m @@ -82,7 +82,7 @@ NS_ASSUME_NONNULL_BEGIN - (NSString *)name { - return [[TextSecureKitEnv sharedEnv].contactsManager nameStringForPhoneIdentifier:self.contactIdentifier]; + return [[TextSecureKitEnv sharedEnv].contactsManager displayNameForPhoneIdentifier:self.contactIdentifier]; } #if TARGET_OS_IPHONE diff --git a/src/Messages/OWSDisappearingMessagesJob.m b/src/Messages/OWSDisappearingMessagesJob.m index 0baf6ef1c..485ffa0a5 100644 --- a/src/Messages/OWSDisappearingMessagesJob.m +++ b/src/Messages/OWSDisappearingMessagesJob.m @@ -192,7 +192,7 @@ NS_ASSUME_NONNULL_BEGIN if ([message isKindOfClass:[TSIncomingMessage class]]) { TSIncomingMessage *incomingMessage = (TSIncomingMessage *)message; - NSString *contactName = [contactsManager nameStringForPhoneIdentifier:incomingMessage.authorId]; + NSString *contactName = [contactsManager displayNameForPhoneIdentifier:incomingMessage.authorId]; [[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestamp thread:message.thread diff --git a/src/Messages/TSGroupModel.m b/src/Messages/TSGroupModel.m index c02edcc70..55a42e42b 100644 --- a/src/Messages/TSGroupModel.m +++ b/src/Messages/TSGroupModel.m @@ -81,7 +81,7 @@ if ([membersWhoLeft count] > 0) { NSArray *oldMembersNames = [[membersWhoLeft allObjects] map:^NSString*(NSString* item) { - return [contactsManager nameStringForPhoneIdentifier:item]; + return [contactsManager displayNameForPhoneIdentifier:item]; }]; updatedGroupInfoString = [updatedGroupInfoString stringByAppendingString:[NSString @@ -91,7 +91,7 @@ if ([membersWhoJoined count] > 0) { NSArray *newMembersNames = [[membersWhoJoined allObjects] map:^NSString*(NSString* item) { - return [contactsManager nameStringForPhoneIdentifier:item]; + return [contactsManager displayNameForPhoneIdentifier:item]; }]; updatedGroupInfoString = [updatedGroupInfoString stringByAppendingString:[NSString stringWithFormat:NSLocalizedString(@"GROUP_MEMBER_JOINED", @""), diff --git a/src/Messages/TSMessagesManager.m b/src/Messages/TSMessagesManager.m index ca29ce688..57cef4da3 100644 --- a/src/Messages/TSMessagesManager.m +++ b/src/Messages/TSMessagesManager.m @@ -453,7 +453,7 @@ NS_ASSUME_NONNULL_BEGIN durationSeconds:OWSDisappearingMessagesConfigurationDefaultExpirationDuration]; } [disappearingMessagesConfiguration save]; - NSString *name = [self.contactsManager nameStringForPhoneIdentifier:envelope.source]; + NSString *name = [self.contactsManager displayNameForPhoneIdentifier:envelope.source]; OWSDisappearingConfigurationUpdateInfoMessage *message = [[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:envelope.timestamp thread:thread @@ -502,7 +502,7 @@ NS_ASSUME_NONNULL_BEGIN break; } case OWSSignalServiceProtosGroupContextTypeQuit: { - NSString *nameString = [self.contactsManager nameStringForPhoneIdentifier:envelope.source]; + NSString *nameString = [self.contactsManager displayNameForPhoneIdentifier:envelope.source]; NSString *updateGroupInfo = [NSString stringWithFormat:NSLocalizedString(@"GROUP_MEMBER_LEFT", @""), nameString]; diff --git a/src/Protocols/ContactsManagerProtocol.h b/src/Protocols/ContactsManagerProtocol.h index 68b88a139..e55cf9137 100644 --- a/src/Protocols/ContactsManagerProtocol.h +++ b/src/Protocols/ContactsManagerProtocol.h @@ -7,12 +7,12 @@ @protocol ContactsManagerProtocol -- (NSString *)nameStringForPhoneIdentifier:(NSString *)phoneNumber; -- (NSArray *)signalContacts; -+ (BOOL)name:(NSString *)nameString matchesQuery:(NSString *)queryString; +- (NSString * _Nonnull)displayNameForPhoneIdentifier:(NSString * _Nullable)phoneNumber; +- (NSArray * _Nonnull)signalContacts; ++ (BOOL)name:(NSString * _Nonnull)nameString matchesQuery:(NSString * _Nonnull)queryString; #if TARGET_OS_IPHONE -- (UIImage *)imageForPhoneIdentifier:(NSString *)phoneNumber; +- (UIImage * _Nullable)imageForPhoneIdentifier:(NSString * _Nullable)phoneNumber; #endif @end diff --git a/src/Security/OWSFingerprintBuilder.m b/src/Security/OWSFingerprintBuilder.m index f1b920fb6..197f8e625 100644 --- a/src/Security/OWSFingerprintBuilder.m +++ b/src/Security/OWSFingerprintBuilder.m @@ -42,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN - (OWSFingerprint *)fingerprintWithTheirSignalId:(NSString *)theirSignalId theirIdentityKey:(NSData *)theirIdentityKey { - NSString *theirName = [self.contactsManager nameStringForPhoneIdentifier:theirSignalId]; + NSString *theirName = [self.contactsManager displayNameForPhoneIdentifier:theirSignalId]; NSString *mySignalId = [self.storageManager localNumber]; NSData *myIdentityKey = [self.storageManager identityKeyPair].publicKey; diff --git a/tests/TestSupport/Fakes/OWSFakeContactsManager.m b/tests/TestSupport/Fakes/OWSFakeContactsManager.m index e3ae874f2..5c587672e 100644 --- a/tests/TestSupport/Fakes/OWSFakeContactsManager.m +++ b/tests/TestSupport/Fakes/OWSFakeContactsManager.m @@ -9,22 +9,22 @@ NS_ASSUME_NONNULL_BEGIN @implementation OWSFakeContactsManager -- (NSString *)nameStringForPhoneIdentifier:(NSString *)phoneNumber +- (NSString * _Nonnull)displayNameForPhoneIdentifier:(NSString * _Nullable)phoneNumber { return @"Fake name"; } -- (NSArray *)signalContacts +- (NSArray * _Nonnull)signalContacts { return @[]; } -+ (BOOL)name:(NSString *)nameString matchesQuery:(NSString *)queryString ++ (BOOL)name:(NSString * _Nonnull)nameString matchesQuery:(NSString * _Nonnull)queryString { return YES; } -- (nullable UIImage *)imageForPhoneIdentifier:(NSString *)phoneNumber +- (UIImage * _Nullable)imageForPhoneIdentifier:(NSString * _Nullable)phoneNumber { return nil; }