Fix merge breakage.

pull/1/head
Matthew Chen 6 years ago
parent f37aacca85
commit d6a51a2a42

@ -3600,7 +3600,8 @@ typedef enum : NSUInteger {
TSOutgoingMessage *message = [ThreadUtil enqueueMessageWithAttachments:attachments TSOutgoingMessage *message = [ThreadUtil enqueueMessageWithAttachments:attachments
messageBody:messageText messageBody:messageText
inThread:self.thread inThread:self.thread
quotedReplyModel:self.inputToolbar.quotedReply]; quotedReplyModel:self.inputToolbar.quotedReply
linkPreview:nil];
[self messageWasSent:message]; [self messageWasSent:message];
@ -3977,7 +3978,8 @@ typedef enum : NSUInteger {
// before the attachment is downloaded) // before the attachment is downloaded)
message = [ThreadUtil enqueueMessageWithAttachment:attachment message = [ThreadUtil enqueueMessageWithAttachment:attachment
inThread:self.thread inThread:self.thread
quotedReplyModel:self.inputToolbar.quotedReply]; quotedReplyModel:self.inputToolbar.quotedReply
linkPreview:nil];
} else { } else {
[self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
message = [ThreadUtil enqueueMessageWithText:text message = [ThreadUtil enqueueMessageWithText:text

Loading…
Cancel
Save