From 7ec6ee1bfc7ac98443a5f478253ca185cb1c9cc6 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 17 Dec 2020 09:50:28 +1100 Subject: [PATCH] Remove unnecessary dispatch_async --- .../ConversationViewController.m | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Session/Signal/ConversationView/ConversationViewController.m b/Session/Signal/ConversationView/ConversationViewController.m index 3b5369e1a..dda1cfa72 100644 --- a/Session/Signal/ConversationView/ConversationViewController.m +++ b/Session/Signal/ConversationView/ConversationViewController.m @@ -3738,22 +3738,20 @@ typedef enum : NSUInteger { [self.conversationViewModel appendUnsavedOutgoingTextMessage:tsMessage]; [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { message.linkPreview = [SNLinkPreview from:linkPreviewDraft using:transaction]; - } completion:^{ + } completion:^{ // Completes on the main queue + tsMessage.linkPreview = [OWSLinkPreview from:message.linkPreview]; + [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + [tsMessage saveWithTransaction:transaction]; + }]; + [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + [SNMessageSender send:message withAttachments:@[] inThread:thread usingTransaction:transaction]; + [thread setDraft:@"" transaction:transaction]; + }]; + [self messageWasSent:tsMessage]; + [self.inputToolbar clearTextMessageAnimated:YES]; + [self resetMentions]; dispatch_async(dispatch_get_main_queue(), ^{ - tsMessage.linkPreview = [OWSLinkPreview from:message.linkPreview]; - [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - [tsMessage saveWithTransaction:transaction]; - }]; - [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - [SNMessageSender send:message withAttachments:@[] inThread:thread usingTransaction:transaction]; - [thread setDraft:@"" transaction:transaction]; - }]; - [self messageWasSent:tsMessage]; - [self.inputToolbar clearTextMessageAnimated:YES]; - [self resetMentions]; - dispatch_async(dispatch_get_main_queue(), ^{ - [[weakSelf inputToolbar] toggleDefaultKeyboard]; - }); + [[weakSelf inputToolbar] toggleDefaultKeyboard]; }); }]; }