From 82179c6d47b356baa16a56d93502ce0d9a9c565b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 16 Mar 2017 14:11:05 -0300 Subject: [PATCH] Respond to CR. // FREEBIE --- .../MessageComposeTableViewController.m | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Signal/src/view controllers/MessageComposeTableViewController.m b/Signal/src/view controllers/MessageComposeTableViewController.m index 208c56137..f3c25ecfd 100644 --- a/Signal/src/view controllers/MessageComposeTableViewController.m +++ b/Signal/src/view controllers/MessageComposeTableViewController.m @@ -35,10 +35,10 @@ NS_ASSUME_NONNULL_BEGIN // A list of possible phone numbers parsed from the search text as // E164 values. -@property (nonatomic) NSArray *searchPhoneNumbers; +@property (nonatomic) NSArray *searchPhoneNumbers; // A list of possible phone numbers parsed from the search text // that correspond to known accounts as E164 values. -@property (nonatomic) NSArray *searchPhoneNumberWithAccounts; +@property (nonatomic) NSArray *searchPhoneNumberWithAccounts; // This dictionary is used to cache the set of phone numbers // which are known to correspond to Signal accounts. @property (nonatomic, nonnull, readonly) NSMutableSet *phoneNumberAccountSet; @@ -63,7 +63,6 @@ typedef NS_ENUM(NSInteger, AdvancedSettingsTableViewControllerSection) { MessageComposeTableViewControllerSection_Count // meta section }; -NSString *const MessageComposeTableViewControllerCellInvite = @"ContactTableInviteCell"; NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableViewCell"; @implementation MessageComposeTableViewController @@ -350,7 +349,7 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie OWSContactsSearcher *contactsSearcher = [[OWSContactsSearcher alloc] initWithContacts: self.contacts]; self.searchResults = [contactsSearcher filterWithString:searchText]; - NSMutableArray *searchPhoneNumbers = [NSMutableArray new]; + NSMutableArray *searchPhoneNumbers = [NSMutableArray new]; for (PhoneNumber *phoneNumber in [PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:searchText clientPhoneNumber:[TSStorageManager localNumber]]) { [searchPhoneNumbers addObject:phoneNumber.toE164]; @@ -398,7 +397,7 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie }]; } -- (void)setSearchPhoneNumbers:(NSArray *)searchPhoneNumbers { +- (void)setSearchPhoneNumbers:(NSArray *)searchPhoneNumbers { if ([_searchPhoneNumbers isEqual:searchPhoneNumbers]) { return; } @@ -411,16 +410,17 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie } - (void)ensureSearchPhoneNumberWithAccounts { - NSMutableArray *searchPhoneNumberWithAccounts = [NSMutableArray new]; + NSMutableArray *searchPhoneNumberWithAccounts = [NSMutableArray new]; for (NSString *phoneNumber in self.searchPhoneNumbers) { - if ([self.phoneNumberAccountSet containsObject:phoneNumber]) { + if ([self.phoneNumberAccountSet containsObject:phoneNumber] && + ![searchPhoneNumberWithAccounts containsObject:phoneNumber]) { [searchPhoneNumberWithAccounts addObject:phoneNumber]; } } self.searchPhoneNumberWithAccounts = searchPhoneNumberWithAccounts; } -- (void)setSearchPhoneNumberWithAccounts:(NSArray *)searchPhoneNumberWithAccounts { +- (void)setSearchPhoneNumberWithAccounts:(NSArray *)searchPhoneNumberWithAccounts { if ([_searchPhoneNumberWithAccounts isEqual:searchPhoneNumberWithAccounts]) { return; } @@ -604,6 +604,7 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie ContactTableViewCell *cell = (ContactTableViewCell *)[tableView dequeueReusableCellWithIdentifier:MessageComposeTableViewControllerCellContact]; + cell.hidden = NO; [cell configureWithContact:[self contactForIndexPath:indexPath] contactsManager:self.contactsManager];