From c744245c4a80c80415b9332990db068542dfcb7f Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 26 Jun 2018 14:53:09 -0400
Subject: [PATCH] Fix corner rounding.

---
 .../ViewControllers/ConversationView/Cells/OWSBubbleView.m   | 2 +-
 .../ConversationView/Cells/OWSMessageBubbleView.m            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
index c7be095fd..5ba4bde79 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
@@ -7,7 +7,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-const CGFloat kOWSMessageCellCornerRadius = 18;
+const CGFloat kOWSMessageCellCornerRadius = 16;
 
 @interface OWSBubbleView ()
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 06bfb428f..7211ca7fa 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -76,8 +76,6 @@ NS_ASSUME_NONNULL_BEGIN
     self.stackView = [UIStackView new];
     self.stackView.axis = UILayoutConstraintAxisVertical;
     self.stackView.alignment = UIStackViewAlignmentFill;
-    [self addSubview:self.stackView];
-    [self.stackView autoPinEdgesToSuperviewEdges];
 
     self.bodyTextView = [self newTextView];
     // Setting dataDetectorTypes is expensive.  Do it just once.
@@ -260,6 +258,9 @@ NS_ASSUME_NONNULL_BEGIN
     CGSize bodyMediaContentSize = [self bodyMediaSize];
     CGSize bodyTextContentSize = [self bodyTextSizeWithIncludeMargins:NO];
 
+    [self.bubbleView addSubview:self.stackView];
+    [self.viewConstraints addObjectsFromArray:[self.stackView autoPinEdgesToSuperviewEdges]];
+
     if ([self.viewItem.interaction isKindOfClass:[TSMessage class]] && self.hasBubbleBackground) {
         TSMessage *message = (TSMessage *)self.viewItem.interaction;
         self.bubbleView.bubbleColor = [self.bubbleFactory bubbleColorWithMessage:message];