From 61611db58efb1b0672eab64cea6c2a695f9bbf29 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 7 Dec 2020 13:19:46 +1100 Subject: [PATCH] Show message sync when sending a message --- .../Signal/ConversationView/ConversationViewController.m | 7 ++++--- .../Link Previews/OWSLinkPreview+Conversion.swift | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Session/Signal/ConversationView/ConversationViewController.m b/Session/Signal/ConversationView/ConversationViewController.m index 0c9327df3..e23512245 100644 --- a/Session/Signal/ConversationView/ConversationViewController.m +++ b/Session/Signal/ConversationView/ConversationViewController.m @@ -3715,13 +3715,14 @@ typedef enum : NSUInteger { message.text = text; message.quote = [SNQuote from:self.inputToolbar.quotedReply]; OWSLinkPreviewDraft *linkPreviewDraft = self.inputToolbar.linkPreviewDraft; + TSThread *thread = self.thread; + TSOutgoingMessage *tsMessage = [TSOutgoingMessage from:message associatedWith:thread]; + [self.conversationViewModel appendUnsavedOutgoingTextMessage:tsMessage]; [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { message.linkPreview = [SNLinkPreview from:linkPreviewDraft using:transaction]; } completion:^{ dispatch_async(dispatch_get_main_queue(), ^{ - TSThread *thread = self.thread; - TSOutgoingMessage *tsMessage = [TSOutgoingMessage from:message associatedWith:thread]; - [self.conversationViewModel appendUnsavedOutgoingTextMessage:tsMessage]; + tsMessage.linkPreview = [OWSLinkPreview from:message.linkPreview]; [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [tsMessage saveWithTransaction:transaction]; }]; diff --git a/SessionMessagingKit/Sending & Receiving/Link Previews/OWSLinkPreview+Conversion.swift b/SessionMessagingKit/Sending & Receiving/Link Previews/OWSLinkPreview+Conversion.swift index 72e49d2e3..59f3f15f6 100644 --- a/SessionMessagingKit/Sending & Receiving/Link Previews/OWSLinkPreview+Conversion.swift +++ b/SessionMessagingKit/Sending & Receiving/Link Previews/OWSLinkPreview+Conversion.swift @@ -1,7 +1,7 @@ extension OWSLinkPreview { - public static func from(_ linkPreview: VisibleMessage.LinkPreview?) -> OWSLinkPreview? { + @objc public static func from(_ linkPreview: VisibleMessage.LinkPreview?) -> OWSLinkPreview? { guard let linkPreview = linkPreview else { return nil } return OWSLinkPreview(urlString: linkPreview.url!, title: linkPreview.title, imageAttachmentId: linkPreview.attachmentID) }