From 687efabede8584ec466316967f07f9fb7915fad6 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 13 Jul 2018 16:24:36 -0400
Subject: [PATCH] Respond to CR.

---
 .../ConversationView/Cells/OWSMessageCell.m   |  4 ++--
 .../ConversationViewController.m              | 23 +++++++++----------
 .../ConversationView/ConversationViewItem.h   |  2 +-
 .../ConversationView/ConversationViewItem.m   |  4 ++--
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 76bbf744a..50d0b0830 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -143,7 +143,7 @@ NS_ASSUME_NONNULL_BEGIN
     [self.messageBubbleView configureViews];
     [self.messageBubbleView loadContent];
 
-    if (self.viewItem.hasDateOrUnreadBreak) {
+    if (self.viewItem.hasCellHeader) {
         CGFloat headerHeight =
             [self.headerView measureWithConversationViewItem:self.viewItem conversationStyle:self.conversationStyle]
                 .height;
@@ -342,7 +342,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     OWSAssert(cellSize.width > 0 && cellSize.height > 0);
 
-    if (self.viewItem.hasDateOrUnreadBreak) {
+    if (self.viewItem.hasCellHeader) {
         cellSize.height +=
             [self.headerView measureWithConversationViewItem:self.viewItem conversationStyle:self.conversationStyle]
                 .height;
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 41bd8fb7d..fb8c89142 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4958,14 +4958,14 @@ typedef enum : NSUInteger {
                 // ...and always show the "disappearing messages" animation.
                 shouldHideFooter
                     = ([timestampText isEqualToString:nextTimestampText] && receiptStatus == nextReceiptStatus
-                        && outgoingMessage.messageState != TSOutgoingMessageStateFailed
-                        && !nextViewItem.hasDateOrUnreadBreak && !isDisappearingMessage);
+                        && outgoingMessage.messageState != TSOutgoingMessageStateFailed && !nextViewItem.hasCellHeader
+                        && !isDisappearingMessage);
             }
 
             // clustering
             if (previousViewItem == nil) {
                 isFirstInCluster = YES;
-            } else if (viewItem.hasDateOrUnreadBreak) {
+            } else if (viewItem.hasCellHeader) {
                 isFirstInCluster = YES;
             } else {
                 isFirstInCluster = previousViewItem.interaction.interactionType != OWSInteractionType_OutgoingMessage;
@@ -4973,7 +4973,7 @@ typedef enum : NSUInteger {
 
             if (nextViewItem == nil) {
                 isLastInCluster = YES;
-            } else if (nextViewItem.hasDateOrUnreadBreak) {
+            } else if (nextViewItem.hasCellHeader) {
                 isLastInCluster = YES;
             } else {
                 isLastInCluster = nextViewItem.interaction.interactionType != OWSInteractionType_OutgoingMessage;
@@ -4997,16 +4997,15 @@ typedef enum : NSUInteger {
                 // We can skip the "incoming message status" footer in a cluster if the next message
                 // has the same footer and no "date break" separates us.
                 // ...but always show the "disappearing messages" animation.
-                shouldHideFooter
-                    = ([timestampText isEqualToString:nextTimestampText] && !nextViewItem.hasDateOrUnreadBreak &&
-                        [NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
-                        && !isDisappearingMessage);
+                shouldHideFooter = ([timestampText isEqualToString:nextTimestampText] && !nextViewItem.hasCellHeader &&
+                    [NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
+                    && !isDisappearingMessage);
             }
 
             // clustering
             if (previousViewItem == nil) {
                 isFirstInCluster = YES;
-            } else if (viewItem.hasDateOrUnreadBreak) {
+            } else if (viewItem.hasCellHeader) {
                 isFirstInCluster = YES;
             } else if (previousViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
                 isFirstInCluster = YES;
@@ -5019,7 +5018,7 @@ typedef enum : NSUInteger {
                 isLastInCluster = YES;
             } else if (nextViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
                 isLastInCluster = YES;
-            } else if (nextViewItem.hasDateOrUnreadBreak) {
+            } else if (nextViewItem.hasCellHeader) {
                 isLastInCluster = YES;
             } else {
                 TSIncomingMessage *nextIncomingMessage = (TSIncomingMessage *)nextViewItem.interaction;
@@ -5039,7 +5038,7 @@ typedef enum : NSUInteger {
 
                     shouldShowSenderName
                         = (![NSObject isNullableObject:previousIncomingSenderId equalTo:incomingSenderId]
-                            || viewItem.hasDateOrUnreadBreak);
+                            || viewItem.hasCellHeader);
                 }
                 if (shouldShowSenderName) {
                     senderName = [self.contactsManager
@@ -5056,7 +5055,7 @@ typedef enum : NSUInteger {
                 shouldShowSenderAvatar = YES;
                 if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {
                     shouldShowSenderAvatar = (![NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
-                        || nextViewItem.hasDateOrUnreadBreak);
+                        || nextViewItem.hasCellHeader);
                 }
             }
         }
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
index 80c5dee70..94c2b0fc8 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
@@ -54,7 +54,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 @property (nonatomic, readonly) BOOL isQuotedReply;
 @property (nonatomic, readonly) BOOL hasQuotedAttachment;
 @property (nonatomic, readonly) BOOL hasQuotedText;
-@property (nonatomic, readonly) BOOL hasDateOrUnreadBreak;
+@property (nonatomic, readonly) BOOL hasCellHeader;
 
 @property (nonatomic, readonly) BOOL isExpiringMessage;
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index ec2ac7515..edb6b0fc9 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -150,7 +150,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     return message.isExpiringMessage;
 }
 
-- (BOOL)hasDateOrUnreadBreak
+- (BOOL)hasCellHeader
 {
     return self.shouldShowDate || self.unreadIndicator;
 }
@@ -277,7 +277,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
 {
     OWSAssert(previousLayoutItem);
 
-    if (self.hasDateOrUnreadBreak) {
+    if (self.hasCellHeader) {
         return OWSMessageHeaderViewDateHeaderVMargin;
     }