Respond to CR.

// FREEBIE
pull/1/head
Matthew Chen 9 years ago
parent e36b5a4602
commit ee765df4b1

@ -202,7 +202,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
[actionSheetController [actionSheetController
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_VIEW_CONTACT_INFO", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_VIEW_CONTACT_INFO",
@"Button label for the 'show contact info' button") @"Button label for the 'show contact info' button")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) { handler:^(UIAlertAction *_Nonnull action) {
[self showContactInfoViewForMember:indexPath]; [self showContactInfoViewForMember:indexPath];
}]]; }]];
@ -216,7 +216,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
[actionSheetController [actionSheetController
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON",
@"Button label for the 'unblock' button") @"Button label for the 'unblock' button")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) { handler:^(UIAlertAction *_Nonnull action) {
[BlockListUIUtils [BlockListUIUtils
showUnblockContactActionSheet:contact showUnblockContactActionSheet:contact
@ -245,7 +245,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
[actionSheetController [actionSheetController
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON",
@"Button label for the 'unblock' button") @"Button label for the 'unblock' button")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) { handler:^(UIAlertAction *_Nonnull action) {
[BlockListUIUtils [BlockListUIUtils
showUnblockPhoneNumberActionSheet:recipientId showUnblockPhoneNumberActionSheet:recipientId
@ -274,14 +274,14 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
[actionSheetController [actionSheetController
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_SEND_MESSAGE", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_SEND_MESSAGE",
@"Button label for the 'send message to group member' button") @"Button label for the 'send message to group member' button")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) { handler:^(UIAlertAction *_Nonnull action) {
[self showConversationViewForMember:indexPath]; [self showConversationViewForMember:indexPath];
}]]; }]];
[actionSheetController [actionSheetController
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_CALL", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_CALL",
@"Button label for the 'call group member' button") @"Button label for the 'call group member' button")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) { handler:^(UIAlertAction *_Nonnull action) {
[self callMember:indexPath]; [self callMember:indexPath];
}]]; }]];
@ -363,7 +363,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
- (BOOL)isContactBlocked:(Contact *)contact - (BOOL)isContactBlocked:(Contact *)contact
{ {
if (contact.parsedPhoneNumbers.count < 1) { if (contact.parsedPhoneNumbers.count < 1) {
// Hide contacts without any valid phone numbers. // Do not consider contacts without any valid phone numbers to be blocked.
return NO; return NO;
} }

Loading…
Cancel
Save