oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse source 
// FREEBIE
This commit is contained in:
Matthew Chen 2017-04-05 12:22:35 -04:00
parent af6e51f83c
commit f56227ce26
3 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Signal/src/ViewControllers/AddToBlockListViewController.m
View file

@ -341,9 +341,10 @@ NSString *const kContactsTable_CellReuseIdentifier = @"kContactsTable_CellReuseI
[self.contactsTableView reloadData]; [self.contactsTableView reloadData];
} }
- (BOOL)isContactBlocked:(Contact *)contact - (BOOL)isContactBlockedOrHidden:(Contact *)contact
{ {
if (contact.parsedPhoneNumbers.count < 1) { if (contact.parsedPhoneNumbers.count < 1) {
// Hide contacts without any valid phone numbers.
return YES; return YES;
} }
@ -371,11 +372,11 @@ NSString *const kContactsTable_CellReuseIdentifier = @"kContactsTable_CellReuseI
{ {
NSMutableArray<Contact *> *result = [NSMutableArray new]; NSMutableArray<Contact *> *result = [NSMutableArray new];
for (Contact *contact in self.contactsManager.signalContacts) { for (Contact *contact in self.contactsManager.signalContacts) {
if (![self isContactBlocked:contact] && ![self isCurrentUserContact:contact]) { if (![self isContactBlockedOrHidden:contact] && ![self isCurrentUserContact:contact]) {
[result addObject:contact]; [result addObject:contact];
} }
} }
return result; return [result copy];
} }
#pragma mark - CountryCodeViewControllerDelegate #pragma mark - CountryCodeViewControllerDelegate

18
Signal/src/ViewControllers/MessageComposeTableViewController.m
View file

@ -683,9 +683,10 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie
[self.tableView reloadData]; [self.tableView reloadData];
} }
- (BOOL)isContactBlocked:(Contact *)contact - (BOOL)isContactBlockedOrHidden:(Contact *)contact
{ {
if (contact.parsedPhoneNumbers.count < 1) { if (contact.parsedPhoneNumbers.count < 1) {
// Hide contacts without any valid phone numbers.
return YES; return YES;
} }
@ -698,26 +699,15 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie
return NO; return NO;
} }
- (BOOL)isCurrentUserContact:(Contact *)contact
{
for (PhoneNumber *phoneNumber in contact.parsedPhoneNumbers) {
if ([[phoneNumber toE164] isEqualToString:[TSAccountManager localNumber]]) {
return YES;
}
}
return NO;
}
- (NSArray<Contact *> *_Nonnull)filteredContacts - (NSArray<Contact *> *_Nonnull)filteredContacts
{ {
NSMutableArray<Contact *> *result = [NSMutableArray new]; NSMutableArray<Contact *> *result = [NSMutableArray new];
for (Contact *contact in self.contactsManager.signalContacts) { for (Contact *contact in self.contactsManager.signalContacts) {
if (![self isContactBlocked:contact] && ![self isCurrentUserContact:contact]) { if (![self isContactBlockedOrHidden:contact]) {
[result addObject:contact]; [result addObject:contact];
} }
} }
return result; return [result copy];
} }
#pragma mark - Navigation #pragma mark - Navigation

7
Signal/src/ViewControllers/NewGroupViewController.m
View file

@ -112,9 +112,10 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
[self.tableView reloadData]; [self.tableView reloadData];
} }
- (BOOL)isContactBlocked:(Contact *)contact - (BOOL)isContactBlockedOrHidden:(Contact *)contact
{ {
if (contact.parsedPhoneNumbers.count < 1) { if (contact.parsedPhoneNumbers.count < 1) {
// Hide contacts without any valid phone numbers.
return YES; return YES;
} }
@ -158,12 +159,12 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
{ {
NSMutableArray<Contact *> *result = [NSMutableArray new]; NSMutableArray<Contact *> *result = [NSMutableArray new];
for (Contact *contact in self.contactsManager.signalContacts) { for (Contact *contact in self.contactsManager.signalContacts) {
if (![self isContactBlocked:contact] && ![self isCurrentUserContact:contact] if (![self isContactBlockedOrHidden:contact] && ![self isCurrentUserContact:contact]
&& ![self isContactInGroup:contact]) { && ![self isContactInGroup:contact]) {
[result addObject:contact]; [result addObject:contact];
} }
} }
return result; return [result copy];
} }
- (void)configWithThread:(TSGroupThread *)gThread { - (void)configWithThread:(TSGroupThread *)gThread {