Merge branch 'charlesmchen/improveGroupMembersView'

Signal/src/ViewControllers/AddToBlockListViewController.m

@@ -22,8 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 NSString * const kAddToBlockListViewControllerCellIdentifier = @"kAddToBlockListViewControllerCellIdentifier";
 
-NSString *const kContactsTable_CellReuseIdentifier = @"kContactsTable_CellReuseIdentifier";
-
 #pragma mark -
 
 @interface AddToBlockListViewController () <CountryCodeViewControllerDelegate,

Signal/src/ViewControllers/MessagesViewController.h

@@ -41,7 +41,9 @@ extern NSString *const OWSMessagesViewControllerDidAppearNotification;
 @property (nonatomic, strong) AVAudioPlayer *audioPlayer;
 @property (nonatomic, strong) AVAudioRecorder *audioRecorder;
 
-- (void)configureForThread:(TSThread *)thread keyboardOnViewAppearing:(BOOL)keyboardAppearing;
+- (void)configureForThread:(TSThread *)thread
+    keyboardOnViewAppearing:(BOOL)keyboardAppearing
+        callOnViewAppearing:(BOOL)callOnViewAppearing;
 - (void)popKeyBoard;
 
 #pragma mark 3D Touch Methods

Signal/src/ViewControllers/MessagesViewController.m

@@ -219,6 +219,7 @@ typedef enum : NSUInteger {
 
 @property (nonatomic) NSUInteger page;
 @property (nonatomic) BOOL composeOnOpen;
+@property (nonatomic) BOOL callOnOpen;
 @property (nonatomic) BOOL peek;
 
 @property (nonatomic, readonly) OWSContactsManager *contactsManager;
@@ -318,10 +319,18 @@ typedef enum : NSUInteger {
     [self hideInputIfNeeded];
 }
 
-- (void)configureForThread:(TSThread *)thread keyboardOnViewAppearing:(BOOL)keyboardAppearing {
+- (void)configureForThread:(TSThread *)thread
+    keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
+        callOnViewAppearing:(BOOL)callOnViewAppearing
+{
+    if (callOnViewAppearing) {
+        keyboardOnViewAppearing = NO;
+    }
+
     _thread = thread;
     isGroupConversation = [self.thread isKindOfClass:[TSGroupThread class]];
-    _composeOnOpen                 = keyboardAppearing;
+    _composeOnOpen = keyboardOnViewAppearing;
+    _callOnOpen = callOnViewAppearing;
 
     [self markAllMessagesAsRead];
 
@@ -719,6 +728,11 @@ typedef enum : NSUInteger {
     self.inputToolbar.contentView.textView.editable = YES;
     if (_composeOnOpen && !self.inputToolbar.hidden) {
         [self popKeyBoard];
+        _composeOnOpen = NO;
+    }
+    if (_callOnOpen) {
+        [self callAction:nil];
+        _callOnOpen = NO;
     }
     [self updateNavigationBarSubtitleLabel];
 }

Signal/src/ViewControllers/ShowGroupMembersViewController.m

@@ -3,12 +3,15 @@
 //
 
 #import "ShowGroupMembersViewController.h"
-#import "SignalsViewController.h"
+#import "BlockListUIUtils.h"
-#import "OWSContactsManager.h"
+#import "ContactTableViewCell.h"
 #import "Environment.h"
 #import "GroupContactsResult.h"
+#import "OWSContactsManager.h"
+#import "SignalsViewController.h"
 #import "UIUtil.h"
 #import <AddressBookUI/AddressBookUI.h>
+#import <SignalServiceKit/OWSBlockingManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -20,6 +23,9 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
 @property TSGroupThread *thread;
 @property (nonatomic, readonly) OWSContactsManager *_Nonnull contactsManager;
 
+@property (nonatomic, readonly) OWSBlockingManager *blockingManager;
+@property (nonatomic, readonly) NSArray<NSString *> *blockedPhoneNumbers;
+
 @end
 
 @implementation ShowGroupMembersViewController
@@ -31,7 +37,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
         return self;
     }
 
-    _contactsManager = [Environment getCurrent].contactsManager;
+    [self commonInit];
 
     return self;
 }
@@ -43,11 +49,43 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
         return self;
     }
 
-    _contactsManager = [Environment getCurrent].contactsManager;
+    [self commonInit];
 
     return self;
 }
 
+
+- (void)commonInit
+{
+    _blockingManager = [OWSBlockingManager sharedManager];
+    _blockedPhoneNumbers = [_blockingManager blockedPhoneNumbers];
+    _contactsManager = [Environment getCurrent].contactsManager;
+
+    [self addNotificationListeners];
+}
+
+- (void)addNotificationListeners
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(blockedPhoneNumbersDidChange:)
+                                                 name:kNSNotificationName_BlockedPhoneNumbersDidChange
+                                               object:nil];
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)blockedPhoneNumbersDidChange:(id)notification
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        _blockedPhoneNumbers = [_blockingManager blockedPhoneNumbers];
+
+        [self.tableView reloadData];
+    });
+}
+
 - (void)configWithThread:(TSGroupThread *)gThread {
     _thread = gThread;
 }
@@ -62,11 +100,15 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
 
     self.groupContacts =
         [[GroupContactsResult alloc] initWithMembersId:self.thread.groupModel.groupMemberIds without:nil];
-
+    __weak ShowGroupMembersViewController *weakSelf = self;
     [self.contactsManager.getObservableContacts watchLatestValue:^(id latestValue) {
-        self.groupContacts =
+        ShowGroupMembersViewController *strongSelf = weakSelf;
-            [[GroupContactsResult alloc] initWithMembersId:self.thread.groupModel.groupMemberIds without:nil];
+        if (!strongSelf) {
-        [self.tableView reloadData];
+            return;
+        }
+        strongSelf.groupContacts =
+            [[GroupContactsResult alloc] initWithMembersId:strongSelf.thread.groupModel.groupMemberIds without:nil];
+        [strongSelf.tableView reloadData];
     }
                                                         onThread:[NSThread mainThread]
                                                   untilCancelled:nil];
@@ -76,6 +118,8 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
 
 - (void)initializeTableView {
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
+    [self.tableView registerClass:[ContactTableViewCell class]
+           forCellReuseIdentifier:kContactsTable_CellReuseIdentifier];
 }
 
 #pragma mark - Actions
@@ -90,44 +134,176 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
     return (NSInteger)[self.groupContacts numberOfMembers] + 1;
 }
 
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SearchCell"];
+{
 
-    if (cell == nil) {
+    if (indexPath.row == 0) {
-        cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+        UITableViewCell *cell = [UITableViewCell new];
-                                      reuseIdentifier:indexPath.row == 0 ? @"HeaderCell" : @"GroupSearchCell"];
-    }
-    if (indexPath.row > 0) {
-        NSIndexPath *relativeIndexPath = [NSIndexPath indexPathForRow:indexPath.row - 1 inSection:indexPath.section];
-        if ([self.groupContacts isContactAtIndexPath:relativeIndexPath]) {
-            Contact *contact              = [self contactForIndexPath:relativeIndexPath];
-            cell.textLabel.attributedText =
-                [self.contactsManager formattedFullNameForContact:contact font:cell.textLabel.font];
-        } else {
-            cell.textLabel.text = [self.groupContacts identifierForIndexPath:relativeIndexPath];
-        }
-    } else {
         cell.textLabel.text      = NSLocalizedString(@"GROUP_MEMBERS_HEADER", @"header for table which lists the members of this group thread");
         cell.textLabel.textColor = [UIColor lightGrayColor];
         cell.selectionStyle      = UITableViewCellSelectionStyleNone;
         cell.userInteractionEnabled = NO;
+        return cell;
     }
 
-    tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
+    // Adjust index path for the header row.
+    indexPath = [NSIndexPath indexPathForRow:indexPath.row - 1 inSection:indexPath.section];
+
+    ContactTableViewCell *cell = [ContactTableViewCell new];
 
+    if ([self.groupContacts isContactAtIndexPath:indexPath]) {
+        Contact *contact = [self contactForIndexPath:indexPath];
+
+        BOOL isBlocked = [self isContactBlocked:contact];
+        if (isBlocked) {
+            cell.accessoryMessage
+                = NSLocalizedString(@"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked.");
+        } else {
+            OWSAssert(cell.accessoryMessage == nil);
+        }
+        [cell configureWithContact:contact contactsManager:self.contactsManager];
+    } else {
+        NSString *recipientId = [self.groupContacts identifierForIndexPath:indexPath];
+        BOOL isBlocked = [self isRecipientIdBlocked:recipientId];
+        if (isBlocked) {
+            cell.accessoryMessage
+                = NSLocalizedString(@"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked.");
+        } else {
+            OWSAssert(cell.accessoryMessage == nil);
+        }
+        [cell configureWithRecipientId:recipientId contactsManager:self.contactsManager];
+    }
     return cell;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (indexPath.row == 0) {
+        return 45.f;
+    } else {
+        return [ContactTableViewCell rowHeight];
+    }
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    NSIndexPath *relativeIndexPath = [NSIndexPath indexPathForRow:indexPath.row - 1 inSection:indexPath.section];
+    if (indexPath.row == 0) {
+        OWSAssert(0);
+        return;
+    }
+
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+    // Adjust index path for the header row.
+    indexPath = [NSIndexPath indexPathForRow:indexPath.row - 1 inSection:indexPath.section];
+
+    UIAlertController *actionSheetController =
+        [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+
+    [actionSheetController
+        addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_VIEW_CONTACT_INFO",
+                                                     @"Button label for the 'show contact info' button")
+                                           style:UIAlertActionStyleDefault
+                                         handler:^(UIAlertAction *_Nonnull action) {
+                                             [self showContactInfoViewForMember:indexPath];
+                                         }]];
+
+    BOOL isBlocked;
+    if ([self.groupContacts isContactAtIndexPath:indexPath]) {
+        Contact *contact = [self contactForIndexPath:indexPath];
+
+        isBlocked = [self isContactBlocked:contact];
+        if (isBlocked) {
+            [actionSheetController
+                addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON",
+                                                             @"Button label for the 'unblock' button")
+                                                   style:UIAlertActionStyleDefault
+                                                 handler:^(UIAlertAction *_Nonnull action) {
+                                                     [BlockListUIUtils
+                                                         showUnblockContactActionSheet:contact
+                                                                    fromViewController:self
+                                                                       blockingManager:self.blockingManager
+                                                                       contactsManager:self.contactsManager
+                                                                       completionBlock:nil];
+                                                 }]];
+        } else {
+            [actionSheetController
+                addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON",
+                                                             @"Button label for the 'block' button")
+                                                   style:UIAlertActionStyleDestructive
+                                                 handler:^(UIAlertAction *_Nonnull action) {
+                                                     [BlockListUIUtils showBlockContactActionSheet:contact
+                                                                                fromViewController:self
+                                                                                   blockingManager:self.blockingManager
+                                                                                   contactsManager:self.contactsManager
+                                                                                   completionBlock:nil];
+                                                 }]];
+        }
+    } else {
+        NSString *recipientId = [self.groupContacts identifierForIndexPath:indexPath];
+        isBlocked = [self isRecipientIdBlocked:recipientId];
+        if (isBlocked) {
+            [actionSheetController
+                addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON",
+                                                             @"Button label for the 'unblock' button")
+                                                   style:UIAlertActionStyleDefault
+                                                 handler:^(UIAlertAction *_Nonnull action) {
+                                                     [BlockListUIUtils
+                                                         showUnblockPhoneNumberActionSheet:recipientId
+                                                                        fromViewController:self
+                                                                           blockingManager:self.blockingManager
+                                                                           contactsManager:self.contactsManager
+                                                                           completionBlock:nil];
+                                                 }]];
+        } else {
+            [actionSheetController
+                addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON",
+                                                             @"Button label for the 'block' button")
+                                                   style:UIAlertActionStyleDestructive
+                                                 handler:^(UIAlertAction *_Nonnull action) {
+                                                     [BlockListUIUtils
+                                                         showBlockPhoneNumberActionSheet:recipientId
+                                                                      fromViewController:self
+                                                                         blockingManager:self.blockingManager
+                                                                         contactsManager:self.contactsManager
+                                                                         completionBlock:nil];
+                                                 }]];
+        }
+    }
+
+    if (!isBlocked) {
+        [actionSheetController
+            addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_SEND_MESSAGE",
+                                                         @"Button label for the 'send message to group member' button")
+                                               style:UIAlertActionStyleDefault
+                                             handler:^(UIAlertAction *_Nonnull action) {
+                                                 [self showConversationViewForMember:indexPath];
+                                             }]];
+        [actionSheetController
+            addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_CALL",
+                                                         @"Button label for the 'call group member' button")
+                                               style:UIAlertActionStyleDefault
+                                             handler:^(UIAlertAction *_Nonnull action) {
+                                                 [self callMember:indexPath];
+                                             }]];
+    }
+
+    UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"TXT_CANCEL_TITLE", @"")
+                                                            style:UIAlertActionStyleCancel
+                                                          handler:nil];
+    [actionSheetController addAction:dismissAction];
 
-    if (indexPath.row > 0 && [self.groupContacts isContactAtIndexPath:relativeIndexPath]) {
+    [self presentViewController:actionSheetController animated:YES completion:nil];
+}
+
+- (void)showContactInfoViewForMember:(NSIndexPath *)indexPath
+{
+    if ([self.groupContacts isContactAtIndexPath:indexPath]) {
         ABPersonViewController *view = [[ABPersonViewController alloc] init];
 
-        Contact *contact                = [self.groupContacts contactForIndexPath:relativeIndexPath];
+        Contact *contact = [self.groupContacts contactForIndexPath:indexPath];
         ABAddressBookRef addressBookRef = ABAddressBookCreateWithOptions(NULL, nil);
-        view.displayedPerson =
+        view.displayedPerson
-            ABAddressBookGetPersonWithRecordID(addressBookRef, contact.recordID); // Assume person is already defined.
+            = ABAddressBookGetPersonWithRecordID(addressBookRef, contact.recordID); // Assume person is already defined.
         view.allowsActions = NO;
         view.allowsEditing = YES;
 
@@ -139,8 +315,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
         CFErrorRef anError   = NULL;
 
         ABMultiValueRef phone = ABMultiValueCreateMutable(kABMultiStringPropertyType);
-        ABMultiValueAddValueAndLabel(
+        ABMultiValueAddValueAndLabel(phone,
-            phone,
             (__bridge CFTypeRef)[self.tableView cellForRowAtIndexPath:indexPath].textLabel.text,
             kABPersonPhoneMainLabel,
             NULL);
@@ -154,8 +329,30 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
             [self.navigationController pushViewController:view animated:YES];
         }
     }
+}
+
+- (void)showConversationViewForMember:(NSIndexPath *)indexPath
+{
+    NSString *recipientId;
+    if ([self.groupContacts isContactAtIndexPath:indexPath]) {
+        Contact *contact = [self.groupContacts contactForIndexPath:indexPath];
+        recipientId = [[contact textSecureIdentifiers] firstObject];
+    } else {
+        recipientId = [self.groupContacts identifierForIndexPath:indexPath];
+    }
+    [Environment messageIdentifier:recipientId withCompose:YES];
+}
 
-    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+- (void)callMember:(NSIndexPath *)indexPath
+{
+    NSString *recipientId;
+    if ([self.groupContacts isContactAtIndexPath:indexPath]) {
+        Contact *contact = [self.groupContacts contactForIndexPath:indexPath];
+        recipientId = [[contact textSecureIdentifiers] firstObject];
+    } else {
+        recipientId = [self.groupContacts identifierForIndexPath:indexPath];
+    }
+    [Environment callUserWithIdentifier:recipientId];
 }
 
 - (Contact *)contactForIndexPath:(NSIndexPath *)indexPath {
@@ -163,6 +360,27 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
     return contact;
 }
 
+- (BOOL)isContactBlocked:(Contact *)contact
+{
+    if (contact.parsedPhoneNumbers.count < 1) {
+        // Do not consider contacts without any valid phone numbers to be blocked.
+        return NO;
+    }
+
+    for (PhoneNumber *phoneNumber in contact.parsedPhoneNumbers) {
+        if ([_blockedPhoneNumbers containsObject:phoneNumber.toE164]) {
+            return YES;
+        }
+    }
+
+    return NO;
+}
+
+- (BOOL)isRecipientIdBlocked:(NSString *)recipientId
+{
+    return [_blockedPhoneNumbers containsObject:recipientId];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

Signal/src/ViewControllers/SignalsViewController.h

@@ -14,7 +14,9 @@
 @property (nonatomic, strong) IBOutlet UILabel *emptyBoxLabel;
 @property (nonatomic) BOOL newlyRegisteredUser;
 
-- (void)presentThread:(TSThread *)thread keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing;
+- (void)presentThread:(TSThread *)thread
+    keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
+        callOnViewAppearing:(BOOL)callOnViewAppearing;
 - (NSNumber *)updateInboxCountLabel;
 - (void)composeNew;
 

Signal/src/ViewControllers/SignalsViewController.m

@@ -131,9 +131,9 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
                                                object:nil];
     [self selectedInbox:self];
 
-    [[[Environment getCurrent] contactsManager]
+    __weak SignalsViewController *weakSelf = self;
-            .getObservableContacts watchLatestValue:^(id latestValue) {
+    [[[Environment getCurrent] contactsManager].getObservableContacts watchLatestValue:^(id latestValue) {
-      [self.tableView reloadData];
+        [weakSelf.tableView reloadData];
     }
                                                                               onThread:[NSThread mainThread]
                                                                         untilCancelled:nil];
@@ -210,7 +210,7 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
 
         MessagesViewController *vc = [MessagesViewController new];
         TSThread *thread           = [self threadForIndexPath:indexPath];
-        [vc configureForThread:thread keyboardOnViewAppearing:NO];
+        [vc configureForThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
         [vc peekSetup];
 
         return vc;
@@ -524,12 +524,15 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     TSThread *thread = [self threadForIndexPath:indexPath];
-    [self presentThread:thread keyboardOnViewAppearing:NO];
+    [self presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
 }
 
 
-- (void)presentThread:(TSThread *)thread keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing {
+- (void)presentThread:(TSThread *)thread
+    keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
+        callOnViewAppearing:(BOOL)callOnViewAppearing
+{
     dispatch_async(dispatch_get_main_queue(), ^{
         MessagesViewController *mvc = [[MessagesViewController alloc] initWithNibName:@"MessagesViewController"
                                                                                bundle:nil];
@@ -539,7 +542,9 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
         }
         [self.navigationController popToRootViewControllerAnimated:YES];
 
-        [mvc configureForThread:thread keyboardOnViewAppearing:keyboardOnViewAppearing];
+        [mvc configureForThread:thread
+            keyboardOnViewAppearing:keyboardOnViewAppearing
+                callOnViewAppearing:callOnViewAppearing];
         [self.navigationController pushViewController:mvc animated:YES];
     });
 }

Signal/src/contact/OWSContactsManager.h

@@ -42,6 +42,7 @@ extern NSString *const OWSContactsManagerSignalRecipientsDidChangeNotification;
 - (NSString *)displayNameForContact:(Contact *)contact;
 - (nullable UIImage *)imageForPhoneIdentifier:(nullable NSString *)identifier;
 - (NSAttributedString *)formattedFullNameForContact:(Contact *)contact font:(UIFont *)font;
+- (NSAttributedString *)formattedFullNameForRecipientId:(NSString *)recipientId font:(UIFont *)font;
 
 - (BOOL)hasAddressBook;
 

Signal/src/contact/OWSContactsManager.m

@@ -102,9 +102,10 @@ NSString *const OWSContactsManagerSignalRecipientsDidChangeNotification =
 
     [self setupAddressBookIfNecessary];
 
+    __weak OWSContactsManager *weakSelf = self;
     [self.observableContactsController watchLatestValueOnArbitraryThread:^(NSArray *latestContacts) {
       @synchronized(self) {
-          [self setupLatestContacts:latestContacts];
+          [weakSelf setupLatestContacts:latestContacts];
       }
     }
                                                      untilCancelled:_life.token];
@@ -559,6 +560,16 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
     return fullNameString;
 }
 
+- (NSAttributedString *)formattedFullNameForRecipientId:(NSString *)recipientId font:(UIFont *)font
+{
+    NSDictionary<NSString *, id> *normalFontAttributes =
+        @{ NSFontAttributeName : font, NSForegroundColorAttributeName : [UIColor ows_darkGrayColor] };
+
+    return [[NSAttributedString alloc]
+        initWithString:[PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:recipientId]
+            attributes:normalFontAttributes];
+}
+
 - (Contact * _Nullable)contactForPhoneIdentifier:(NSString * _Nullable)identifier {
     if (!identifier) {
         return nil;

Signal/src/environment/Environment.h

@@ -64,6 +64,7 @@
 
 + (void)messageThreadId:(NSString *)threadId;
 + (void)messageIdentifier:(NSString *)identifier withCompose:(BOOL)compose;
++ (void)callUserWithIdentifier:(NSString *)identifier;
 + (void)messageGroup:(TSGroupThread *)groupThread;
 
 @end

Signal/src/environment/Environment.m

@@ -212,8 +212,19 @@ static Environment *environment = nil;
     [[TSStorageManager sharedManager]
             .dbConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
       TSThread *thread = [TSContactThread getOrCreateThreadWithContactId:identifier transaction:transaction];
-      [vc presentThread:thread keyboardOnViewAppearing:YES];
+      [vc presentThread:thread keyboardOnViewAppearing:YES callOnViewAppearing:NO];
+    }];
+}
 
++ (void)callUserWithIdentifier:(NSString *)identifier
+{
+    Environment *env = [self getCurrent];
+    SignalsViewController *vc = env.signalsViewController;
+
+    [[TSStorageManager sharedManager].dbConnection
+        asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
+            TSThread *thread = [TSContactThread getOrCreateThreadWithContactId:identifier transaction:transaction];
+            [vc presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:YES];
         }];
 }
 
@@ -221,7 +232,7 @@ static Environment *environment = nil;
     Environment *env          = [self getCurrent];
     SignalsViewController *vc = env.signalsViewController;
 
-    [vc presentThread:groupThread keyboardOnViewAppearing:YES];
+    [vc presentThread:groupThread keyboardOnViewAppearing:YES callOnViewAppearing:NO];
 }
 
 + (void)resetAppData {

Signal/src/views/ContactTableViewCell.h

@@ -13,6 +13,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern NSString *const kContactsTable_CellReuseIdentifier;
+
 @class OWSContactsManager;
 
 @interface ContactTableViewCell : UITableViewCell
@@ -25,6 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)configureWithContact:(Contact *)contact contactsManager:(OWSContactsManager *)contactsManager;
 
+- (void)configureWithRecipientId:(NSString *)recipientId contactsManager:(OWSContactsManager *)contactsManager;
+
 @end
 
 NS_ASSUME_NONNULL_END

Signal/src/views/ContactTableViewCell.m

@@ -12,6 +12,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+NSString *const kContactsTable_CellReuseIdentifier = @"kContactsTable_CellReuseIdentifier";
+
 @interface ContactTableViewCell ()
 
 @property (nonatomic) IBOutlet UILabel *nameLabel;
@@ -53,6 +55,8 @@ NS_ASSUME_NONNULL_BEGIN
     // applyRoundedBorderToImageView requires the avatar to have
     // the correct size.
     _avatarView.frame = CGRectMake(0, 0, kAvatarSize, kAvatarSize);
+    _avatarView.layer.minificationFilter = kCAFilterTrilinear;
+    _avatarView.layer.magnificationFilter = kCAFilterTrilinear;
     [self.contentView addSubview:_avatarView];
 
     _nameLabel = [UILabel new];
@@ -77,8 +81,27 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)configureWithContact:(Contact *)contact contactsManager:(OWSContactsManager *)contactsManager
 {
-    NSMutableAttributedString *attributedText =
+    [self configureWithRecipientId:contact.textSecureIdentifiers.firstObject
-        [[contactsManager formattedFullNameForContact:contact font:self.nameLabel.font] mutableCopy];
+                        avatarName:contact.fullName
+                       displayName:[contactsManager formattedFullNameForContact:contact font:self.nameLabel.font]
+                   contactsManager:contactsManager];
+}
+
+- (void)configureWithRecipientId:(NSString *)recipientId contactsManager:(OWSContactsManager *)contactsManager
+{
+    [self
+        configureWithRecipientId:recipientId
+                      avatarName:@""
+                     displayName:[contactsManager formattedFullNameForRecipientId:recipientId font:self.nameLabel.font]
+                 contactsManager:contactsManager];
+}
+
+- (void)configureWithRecipientId:(NSString *)recipientId
+                      avatarName:(NSString *)avatarName
+                     displayName:(NSAttributedString *)displayName
+                 contactsManager:(OWSContactsManager *)contactsManager
+{
+    NSMutableAttributedString *attributedText = [displayName mutableCopy];
     if (self.accessoryMessage) {
         UILabel *blockedLabel = [[UILabel alloc] init];
         blockedLabel.textAlignment = NSTextAlignmentRight;
@@ -91,9 +114,8 @@ NS_ASSUME_NONNULL_BEGIN
     }
     self.nameLabel.attributedText = attributedText;
     self.avatarView.image =
-        [[[OWSContactAvatarBuilder alloc] initWithContactId:contact.textSecureIdentifiers.firstObject
+        [[[OWSContactAvatarBuilder alloc] initWithContactId:recipientId name:avatarName contactsManager:contactsManager]
-                                                       name:contact.fullName
+            build];
-                                            contactsManager:contactsManager] build];
 
     // Force layout, since imageView isn't being initally rendered on App Store optimized build.
     [self layoutSubviews];

Signal/translations/en.lproj/Localizable.strings

@@ -460,9 +460,18 @@
 /* No comment provided by engineer. */
 "GROUP_MEMBER_LEFT" = " %@ left the group. ";
 
+/* Button label for the 'call group member' button */
+"GROUP_MEMBERS_CALL" = "Call";
+
 /* header for table which lists the members of this group thread */
 "GROUP_MEMBERS_HEADER" = "Group Members";
 
+/* Button label for the 'send message to group member' button */
+"GROUP_MEMBERS_SEND_MESSAGE" = "Send Message";
+
+/* Button label for the 'show contact info' button */
+"GROUP_MEMBERS_VIEW_CONTACT_INFO" = "Contact Info";
+
 /* No comment provided by engineer. */
 "GROUP_REMOVING" = "Leaving group %@";