From 890dfdcc06851780c8485c4f9f32a5b1398d0786 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 29 Jan 2019 10:36:54 -0500
Subject: [PATCH] Fix reset of 'link preview cancelled' state.

---
 .../ConversationView/ConversationInputToolbar.m        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index e525c6242..f178c12a1 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -719,11 +719,6 @@ const CGFloat kMaxTextViewHeight = 98;
 {
     OWSAssertIsOnMainThread();
 
-    if (self.wasLinkPreviewCancelled) {
-        [self clearLinkPreviewStateAndView];
-        return;
-    }
-
     NSString *body =
         [[self messageText] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     if (body.length < 1) {
@@ -732,6 +727,11 @@ const CGFloat kMaxTextViewHeight = 98;
         return;
     }
 
+    if (self.wasLinkPreviewCancelled) {
+        [self clearLinkPreviewStateAndView];
+        return;
+    }
+
     // Don't include link previews for oversize text messages.
     if ([body lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) {
         [self clearLinkPreviewStateAndView];