From 6711ed1cf368812f369c5a93e6134ebf8de154f2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 11 Jul 2018 11:27:13 -0400 Subject: [PATCH] Respond to CR. --- .../ConversationView/Cells/OWSMessageFooterView.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m index 6530261a9..0796a514c 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m @@ -103,7 +103,7 @@ NS_ASSUME_NONNULL_BEGIN } self.timestampLabel.textColor = textColor; - if ([self isDisappearingMessage:viewItem]) { + if ([self shouldShowDisappearingTimer:viewItem]) { TSMessage *message = (TSMessage *)viewItem.interaction; uint64_t expirationTimestamp = message.expiresAt; uint32_t expiresInSeconds = message.expiresInSeconds; @@ -185,7 +185,7 @@ NS_ASSUME_NONNULL_BEGIN return messageStatus == MessageReceiptStatusFailed; } -- (BOOL)isDisappearingMessage:(ConversationViewItem *)viewItem +- (BOOL)shouldShowDisappearingTimer:(ConversationViewItem *)viewItem { OWSAssert(viewItem); @@ -257,7 +257,7 @@ NS_ASSUME_NONNULL_BEGIN } } - if ([self isDisappearingMessage:viewItem]) { + if ([self shouldShowDisappearingTimer:viewItem]) { result.width += ([OWSMessageTimerView measureSize].width + self.hSpacing); }