From 783bf5b81c8ddd3ed2fbd3296fe0ac277dc918ed Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 1 May 2018 16:16:44 -0400
Subject: [PATCH] Clean up ahead of PR.

---
 .../ConversationView/Cells/OWSAudioMessageView.m               | 2 +-
 .../ConversationView/Cells/OWSContactShareView.m               | 2 +-
 .../ConversationView/Cells/OWSGenericAttachmentView.m          | 2 +-
 .../ConversationView/Cells/OWSMessageBubbleView.m              | 3 +--
 Signal/src/ViewControllers/DebugUI/DebugUIMessages.m           | 3 ---
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
index 35cf1e3b4..b462923dd 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
@@ -125,7 +125,7 @@ NS_ASSUME_NONNULL_BEGIN
                                : [self audioColorWithOpacity:0.4f]);
 }
 
-#pragma mark - JSQMessageMediaData protocol
+#pragma mark -
 
 - (CGFloat)audioIconHMargin
 {
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m
index d9719dbaa..77fdf9f50 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-#pragma mark - JSQMessageMediaData protocol
+#pragma mark -
 
 - (CGFloat)iconHMargin
 {
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
index 934178ac3..75f463572 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
@@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-#pragma mark - JSQMessageMediaData protocol
+#pragma mark -
 
 - (CGFloat)iconHMargin
 {
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index da7c26b8d..18f39a1b6 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -332,7 +332,6 @@ NS_ASSUME_NONNULL_BEGIN
             bodyMediaViewHasGreedyWidth = YES;
             break;
         case OWSMessageCellType_ShareContact:
-            // TODO:
             bodyMediaView = [self loadViewForShareContact];
             bodyMediaViewHasGreedyWidth = YES;
             break;
@@ -801,7 +800,7 @@ NS_ASSUME_NONNULL_BEGIN
         [[OWSContactShareView alloc] initWithContactShare:self.viewItem.contactShare
                                                isIncoming:self.isIncoming];
     [contactShareView createContents];
-    //    [self addAttachmentUploadViewIfNecessary:attachmentView];
+    // TODO: Should we change appearance if contact avatar is uploading?
 
     self.loadCellContentBlock = ^{
         // Do nothing.
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index 7e5ba7aeb..4fa2784e2 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -2942,7 +2942,6 @@ typedef OWSContact * (^OWSContactBlock)(void);
                                               contactBlock:^{
                                                   OWSContact *contact = [OWSContact new];
                                                   contact.givenName = @"Alice";
-                                                  contact.displayName = @"Alice";
                                                   OWSContactPhoneNumber *phoneNumber = [OWSContactPhoneNumber new];
                                                   phoneNumber.phoneType = OWSContactPhoneType_Home;
                                                   phoneNumber.phoneNumber = @"+13213214321";
@@ -2956,7 +2955,6 @@ typedef OWSContact * (^OWSContactBlock)(void);
                                               contactBlock:^{
                                                   OWSContact *contact = [OWSContact new];
                                                   contact.givenName = @"Bob";
-                                                  contact.displayName = @"Bob";
                                                   OWSContactEmail *email = [OWSContactEmail new];
                                                   email.emailType = OWSContactEmailType_Home;
                                                   email.email = @"a@b.com";
@@ -2975,7 +2973,6 @@ typedef OWSContact * (^OWSContactBlock)(void);
                                                   contact.namePrefix = @"Ms.";
                                                   contact.nameSuffix = @"Esq.";
                                                   contact.organizationName = @"Falafel Hut";
-                                                  contact.displayName = @"Ms. Alice Bob Carol Esq.";
 
                                                   OWSContactPhoneNumber *phoneNumber1 = [OWSContactPhoneNumber new];
                                                   phoneNumber1.phoneType = OWSContactPhoneType_Home;