Fix reset of 'link preview cancelled' state.

pull/1/head
Matthew Chen 6 years ago
parent f2d580cae6
commit 890dfdcc06

@ -719,11 +719,6 @@ const CGFloat kMaxTextViewHeight = 98;
{ {
OWSAssertIsOnMainThread(); OWSAssertIsOnMainThread();
if (self.wasLinkPreviewCancelled) {
[self clearLinkPreviewStateAndView];
return;
}
NSString *body = NSString *body =
[[self messageText] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; [[self messageText] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
if (body.length < 1) { if (body.length < 1) {
@ -732,6 +727,11 @@ const CGFloat kMaxTextViewHeight = 98;
return; return;
} }
if (self.wasLinkPreviewCancelled) {
[self clearLinkPreviewStateAndView];
return;
}
// Don't include link previews for oversize text messages. // Don't include link previews for oversize text messages.
if ([body lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) { if ([body lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) {
[self clearLinkPreviewStateAndView]; [self clearLinkPreviewStateAndView];

Loading…
Cancel
Save