From 0cc667d123889f64c1a65dbbdd5436e664211fc2 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 25 Jan 2019 15:57:26 -0500
Subject: [PATCH] Fix spacing between quoted replies and link previews in sent
 message bubbles.

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

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 328e93c50..67804e704 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -363,6 +363,13 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
     }
 
     if (self.viewItem.linkPreview) {
+        if (self.isQuotedReply) {
+            UIView *spacerView = [UIView containerView];
+            [spacerView autoSetDimension:ALDimensionHeight toSize:self.bodyMediaQuotedReplyVSpacing];
+            [spacerView setCompressionResistanceHigh];
+            [self.stackView addArrangedSubview:spacerView];
+        }
+
         self.linkPreviewView.state = self.linkPreviewState;
         [self.stackView addArrangedSubview:self.linkPreviewView];
         [self.linkPreviewView addBorderViewsWithBubbleView:self.bubbleView];
@@ -1175,6 +1182,8 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
 
         if (bodyMediaSize && quotedMessageSize && self.hasFullWidthMediaView) {
             cellSize.height += self.bodyMediaQuotedReplyVSpacing;
+        } else if (quotedMessageSize && self.viewItem.linkPreview) {
+            cellSize.height += self.bodyMediaQuotedReplyVSpacing;
         }
     }