From 4b5d994c3fcb6721015bf6f045c7d38be3913f92 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 25 Jun 2018 13:49:31 -0400
Subject: [PATCH] Respond to CR.

---
 .../ConversationView/Cells/OWSMessageBubbleView.m           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 01946162d..51c7d26ee 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -244,7 +244,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     CGSize quotedMessageContentSize = [self quotedMessageSize];
     CGSize bodyMediaContentSize = [self bodyMediaSize];
-    CGSize bodyTextContentSize = [self bodyTextSize:NO];
+    CGSize bodyTextContentSize = [self bodyTextSizeWithIncludeMargins:NO];
 
     if ([self.viewItem.interaction isKindOfClass:[TSMessage class]] && self.hasBubbleBackground) {
         TSMessage *message = (TSMessage *)self.viewItem.interaction;
@@ -850,7 +850,7 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - Measurement
 
 // Size of "message body" text, not quoted reply text.
-- (CGSize)bodyTextSize:(BOOL)includeMargins
+- (CGSize)bodyTextSizeWithIncludeMargins:(BOOL)includeMargins
 {
     OWSAssert(self.layoutInfo);
     OWSAssert(self.layoutInfo.maxMessageWidth > 0);
@@ -988,7 +988,7 @@ NS_ASSUME_NONNULL_BEGIN
     cellSize.width = MAX(cellSize.width, mediaContentSize.width);
     cellSize.height += mediaContentSize.height;
 
-    CGSize textContentSize = [self bodyTextSize:YES];
+    CGSize textContentSize = [self bodyTextSizeWithIncludeMargins:YES];
     cellSize.width = MAX(cellSize.width, textContentSize.width);
     cellSize.height += textContentSize.height;