From 46271e42477bf32bb4ed086eedd99d77ff01500b Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 30 Apr 2020 10:31:42 -0300
Subject: [PATCH] Add gv2 member status indicators.

---
 .../ViewControllers/NewGroupView/NewGroupViewController.m  | 6 ------
 .../RecipientPicker/AddToBlockListViewController.swift     | 5 -----
 .../RecipientPicker/ComposeViewController.swift            | 5 -----
 .../RecipientPicker/RecipientPickerDelegate.swift          | 7 ++++---
 .../ThreadSettings/UpdateGroupViewController.m             | 6 ------
 5 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/Signal/src/ViewControllers/NewGroupView/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupView/NewGroupViewController.m
index 110e6638d5..2b0c1b8318 100644
--- a/Signal/src/ViewControllers/NewGroupView/NewGroupViewController.m
+++ b/Signal/src/ViewControllers/NewGroupView/NewGroupViewController.m
@@ -480,12 +480,6 @@ NS_ASSUME_NONNULL_BEGIN
     return nil;
 }
 
-- (nullable NSAttributedString *)recipientPicker:(RecipientPickerViewController *)recipientPickerViewController
-                  attributedSubtitleForRecipient:(PickedRecipient *)recipient
-{
-    return nil;
-}
-
 - (void)recipientPickerTableViewWillBeginDragging:(RecipientPickerViewController *)recipientPickerViewController
 {
     [self.groupNameTextField resignFirstResponder];
diff --git a/Signal/src/ViewControllers/RecipientPicker/AddToBlockListViewController.swift b/Signal/src/ViewControllers/RecipientPicker/AddToBlockListViewController.swift
index 2b2d72afde..091a8c0318 100644
--- a/Signal/src/ViewControllers/RecipientPicker/AddToBlockListViewController.swift
+++ b/Signal/src/ViewControllers/RecipientPicker/AddToBlockListViewController.swift
@@ -120,11 +120,6 @@ extension AddToBlockListViewController: RecipientPickerDelegate {
         return nil
     }
 
-    func recipientPicker(_ recipientPickerViewController: RecipientPickerViewController,
-                         attributedSubtitleForRecipient recipient: PickedRecipient) -> NSAttributedString? {
-        return nil
-    }
-
     func recipientPickerTableViewWillBeginDragging(_ recipientPickerViewController: RecipientPickerViewController) {}
 
     func recipientPickerNewGroupButtonWasPressed() {}
diff --git a/Signal/src/ViewControllers/RecipientPicker/ComposeViewController.swift b/Signal/src/ViewControllers/RecipientPicker/ComposeViewController.swift
index 4d14bd9ecd..28d0916043 100644
--- a/Signal/src/ViewControllers/RecipientPicker/ComposeViewController.swift
+++ b/Signal/src/ViewControllers/RecipientPicker/ComposeViewController.swift
@@ -125,11 +125,6 @@ extension ComposeViewController: RecipientPickerDelegate {
         return nil
     }
 
-    func recipientPicker(_ recipientPickerViewController: RecipientPickerViewController,
-                         attributedSubtitleForRecipient recipient: PickedRecipient) -> NSAttributedString? {
-        return nil
-    }
-
     func recipientPickerTableViewWillBeginDragging(_ recipientPickerViewController: RecipientPickerViewController) {}
 
     func recipientPickerNewGroupButtonWasPressed() {
diff --git a/Signal/src/ViewControllers/RecipientPicker/RecipientPickerDelegate.swift b/Signal/src/ViewControllers/RecipientPicker/RecipientPickerDelegate.swift
index 9671126e22..8698a30297 100644
--- a/Signal/src/ViewControllers/RecipientPicker/RecipientPickerDelegate.swift
+++ b/Signal/src/ViewControllers/RecipientPicker/RecipientPickerDelegate.swift
@@ -30,8 +30,9 @@ protocol RecipientPickerDelegate: AnyObject {
     func recipientPicker(_ recipientPickerViewController: RecipientPickerViewController,
                          accessoryViewForRecipient recipient: PickedRecipient) -> UIView?
 
-    func recipientPicker(_ recipientPickerViewController: RecipientPickerViewController,
-                         attributedSubtitleForRecipient recipient: PickedRecipient) -> NSAttributedString?
+    @objc
+    optional func recipientPicker(_ recipientPickerViewController: RecipientPickerViewController,
+                                  attributedSubtitleForRecipient recipient: PickedRecipient) -> NSAttributedString?
 
     func recipientPickerTableViewWillBeginDragging(_ recipientPickerViewController: RecipientPickerViewController)
 
@@ -137,7 +138,7 @@ extension RecipientPickerViewController {
                             cell.setAccessoryMessage(accessoryMessage)
                         }
 
-                        if let attributedSubtitle = delegate.recipientPicker(self, attributedSubtitleForRecipient: recipient) {
+                        if let attributedSubtitle = delegate.recipientPicker?(self, attributedSubtitleForRecipient: recipient) {
                             cell.setAttributedSubtitle(attributedSubtitle)
                         }
                     }
diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
index 8ccc3eb9cd..c88cbe3e1b 100644
--- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
@@ -558,12 +558,6 @@ NS_ASSUME_NONNULL_BEGIN
     return nil;
 }
 
-- (nullable NSAttributedString *)recipientPicker:(RecipientPickerViewController *)recipientPickerViewController
-                  attributedSubtitleForRecipient:(PickedRecipient *)recipient
-{
-    return nil;
-}
-
 - (void)recipientPickerTableViewWillBeginDragging:(RecipientPickerViewController *)recipientPickerViewController
 {
     [self.groupNameTextField resignFirstResponder];