From bed5250397f63e0dfca0a18e489fa9d233b79cd3 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 18 Nov 2016 12:42:03 -0500 Subject: [PATCH] remove redunant method // FREEBIE --- Signal/src/contact/OWSContactsManager.h | 1 - Signal/src/contact/OWSContactsManager.m | 6 ------ Signal/src/view controllers/NewGroupViewController.m | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Signal/src/contact/OWSContactsManager.h b/Signal/src/contact/OWSContactsManager.h index 4a3f89191..055199a14 100644 --- a/Signal/src/contact/OWSContactsManager.h +++ b/Signal/src/contact/OWSContactsManager.h @@ -28,7 +28,6 @@ typedef void (^ABReloadRequestCompletionBlock)(NSArray *contacts); - (NSArray *)allContacts; - (NSArray *)signalContacts; -- (NSArray *)textSecureContacts; - (void)doAfterEnvironmentInitSetup; diff --git a/Signal/src/contact/OWSContactsManager.m b/Signal/src/contact/OWSContactsManager.m index 6c60d037c..43ed340fe 100644 --- a/Signal/src/contact/OWSContactsManager.m +++ b/Signal/src/contact/OWSContactsManager.m @@ -394,12 +394,6 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in return [self getSignalUsersFromContactsArray:[self allContacts]]; } -- (NSArray *)textSecureContacts { - return [[self.allContacts filter:^int(Contact *contact) { - return [contact isSignalContact]; - }] sortedArrayUsingComparator:[[self class] contactComparator]]; -} - - (NSString *)nameStringForPhoneIdentifier:(NSString *)identifier { if (!identifier) { return NSLocalizedString(@"UNKNOWN_CONTACT_NAME", diff --git a/Signal/src/view controllers/NewGroupViewController.m b/Signal/src/view controllers/NewGroupViewController.m index 4552b096d..689f8e45d 100644 --- a/Signal/src/view controllers/NewGroupViewController.m +++ b/Signal/src/view controllers/NewGroupViewController.m @@ -72,7 +72,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue" [super viewDidLoad]; [self.navigationController.navigationBar setTranslucent:NO]; - contacts = [Environment getCurrent].contactsManager.textSecureContacts; + contacts = [Environment getCurrent].contactsManager.signalContacts; self.tableView.tableHeaderView.frame = CGRectMake(0, 0, 400, 44);