From bcde04766f7bbb6a2038a9738d871f624987b6db Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 29 Jun 2018 14:25:14 -0400
Subject: [PATCH] Fix layout of quoted replies.

---
 .../Cells/OWSMessageBubbleView.m              |  2 +-
 .../Utils/MessageRecipientStatusUtils.swift   | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 5d40a6c5f..bb168fad8 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -1149,7 +1149,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     NSValue *_Nullable quotedMessageSize = [self quotedMessageSize];
     if (quotedMessageSize) {
-        if (senderNameSize) {
+        if (!senderNameSize) {
             cellSize.height += self.quotedReplyTopMargin;
         }
         cellSize.width = MAX(cellSize.width, quotedMessageSize.CGSizeValue.width);
diff --git a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift
index 3e880973d..df0ebfa44 100644
--- a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift
+++ b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift
@@ -159,4 +159,24 @@ public class MessageRecipientStatusUtils: NSObject {
                                                               referenceView: referenceView)
         return status
     }
+
+    @objc
+    public class func description(forMessageReceiptStatus value: MessageReceiptStatus) -> String {
+        switch(value) {
+        case .read:
+            return "read"
+        case .uploading:
+            return "uploading"
+        case .delivered:
+            return "delivered"
+        case .sent:
+            return "sent"
+        case .sending:
+            return "sending"
+        case .failed:
+            return "failed"
+        case .skipped:
+            return "skipped"
+        }
+    }
 }