From fb1e27d633a3026d7dfcabee799eac85d8d1eeef Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 17 May 2019 09:47:08 +1000
Subject: [PATCH] Fix empty message generation.

Before since we were setting the groupMetaMessage, it was setting the `shouldSave` property to true and thus the message sender was looking for the message in the db.
We now don't set this property so the message should be able to be sent without saving.
---
 SignalMessaging/utils/ThreadUtil.m                   |  1 -
 .../src/Loki/Extensions/TSOutgoingMessage.swift      | 12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m
index f2cad6cf6..b5a5b778a 100644
--- a/SignalMessaging/utils/ThreadUtil.m
+++ b/SignalMessaging/utils/ThreadUtil.m
@@ -89,7 +89,6 @@ typedef void (^BuildOutgoingMessageCompletionBlock)(TSOutgoingMessage *savedMess
 {
     TSOutgoingMessage *message = [TSOutgoingMessage createEmptyOutgoingMessageInThread:thread];
     [self.dbConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-        [message saveWithTransaction:transaction];
         [self.messageSenderJobQueue addMessage:message transaction:transaction];
     }];
     return message;
diff --git a/SignalServiceKit/src/Loki/Extensions/TSOutgoingMessage.swift b/SignalServiceKit/src/Loki/Extensions/TSOutgoingMessage.swift
index 2bebcd6d4..f424cb5c8 100644
--- a/SignalServiceKit/src/Loki/Extensions/TSOutgoingMessage.swift
+++ b/SignalServiceKit/src/Loki/Extensions/TSOutgoingMessage.swift
@@ -3,16 +3,6 @@
     
     /// Loki: This is a message used to establish sessions
     @objc public static func createEmptyOutgoingMessage(inThread thread: TSThread) -> TSOutgoingMessage {
-        return TSOutgoingMessage(outgoingMessageWithTimestamp: NSDate.ows_millisecondTimeStamp(),
-                                 in: thread,
-                                 messageBody: "",
-                                 attachmentIds: [],
-                                 expiresInSeconds: 0,
-                                 expireStartedAt: 0,
-                                 isVoiceMessage: false,
-                                 groupMetaMessage: .unspecified,
-                                 quotedMessage: nil,
-                                 contactShare: nil,
-                                 linkPreview: nil)
+        return TSOutgoingMessage(in: thread, messageBody: "", attachmentId: nil)
     }
 }