From faa6805dccb7ced6eb8eb738aef7cf9654139b6c Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 24 Apr 2020 12:20:52 +1000
Subject: [PATCH] Debug

---
 SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift    | 9 +--------
 .../Loki/Protocol/Multi Device/MultiDeviceProtocol.swift | 2 +-
 SignalServiceKit/src/Messages/OWSMessageSender.m         | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift b/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift
index fd660a013..d53b8dc45 100644
--- a/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift
+++ b/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift
@@ -80,16 +80,9 @@ public final class LokiFileServerAPI : LokiDotNetAPI {
                     }
                 })
             }.map(on: LokiAPI.workQueue) { deviceLinks -> Set<DeviceLink> in
-                func setDeviceLinks(in transaction: YapDatabaseReadWriteTransaction) {
+                storage.dbReadWriteConnection.readWrite { transaction in
                     storage.setDeviceLinks(deviceLinks, in: transaction)
                 }
-                if let transaction = transaction, transaction.connection.pendingTransactionCount != 0 { // TODO: Does keeping the transaction this long even make sense?
-                    setDeviceLinks(in: transaction)
-                } else {
-                    storage.dbReadWriteConnection.readWrite { transaction in
-                        setDeviceLinks(in: transaction)
-                    }
-                }
                 return deviceLinks
             }
         }
diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift
index 59187cc2c..03c7e7f9e 100644
--- a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift	
+++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift	
@@ -43,7 +43,7 @@ public final class MultiDeviceProtocol : NSObject {
         // TODO: I'm pretty sure there are quite a few holes in this logic
         let message = messageSend.message
         let recipientID = messageSend.recipient.recipientId()
-        let thread = messageSend.thread!
+        let thread = messageSend.thread ?? TSContactThread.getOrCreateThread(withContactId: recipientID, transaction: transaction) // TODO: Added this because I think we need it
         let isGroupMessage = thread.isGroupThread()
         let isOpenGroupMessage = (thread as? TSGroupThread)?.isPublicChat == true
         let isDeviceLinkMessage = message is DeviceLinkMessage
diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 65b282458..ece25c01b 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -232,7 +232,7 @@ void AssertIsOnSendingQueue()
 - (void)didSucceed
 {
     if (self.message.messageState != TSOutgoingMessageStateSent) {
-        OWSFailDebug(@"unexpected message status: %@", self.message.statusDescription);
+        [LKLogger print:@"[Loki] Succeeded with sending a message, but the message state isn't TSOutgoingMessageStateSent."];
     }
 
     self.successHandler();