From 00549a993fc34c122f7b8d0e2f77993ffa8051ae Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 3 Dec 2020 10:53:30 +1100
Subject: [PATCH] Debug

---
 .../Sending & Receiving/MessageSender.swift     | 17 +++++------------
 SignalUtilitiesKit/OWSUDManager.swift           |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift
index 8710f57c8..f7a78ce61 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
@@ -107,9 +107,7 @@ public final class MessageSender : NSObject {
             if case .contact(_) = destination, message is VisibleMessage, !isSelfSend {
                 NotificationCenter.default.post(name: .messageSendingFailed, object: NSNumber(value: message.sentTimestamp!))
             }
-            transaction.addCompletionQueue(DispatchQueue.main) {
-                seal.reject(error)
-            }
+            seal.reject(error)
         }
         // Validate the message
         guard message.isValid else { handleFailure(with: Error.invalidMessage, using: transaction); return promise }
@@ -117,9 +115,8 @@ public final class MessageSender : NSObject {
         guard !isSelfSend else {
             storage.withAsync({ transaction in
                 MessageSender.handleSuccessfulMessageSend(message, to: destination, using: transaction)
-            }, completion: {
                 seal.fulfill(())
-            })
+            }, completion: { })
             return promise
         }
         // Attach the user's profile if needed
@@ -224,9 +221,8 @@ public final class MessageSender : NSObject {
                             let notifyPNServerJob = NotifyPNServerJob(message: snodeMessage)
                             JobQueue.shared.add(notifyPNServerJob, using: transaction)
                         }
-                    }, completion: {
                         seal.fulfill(())
-                    })
+                    }, completion: { })
                 }
                 $0.catch(on: DispatchQueue.global(qos: .userInitiated)) { error in
                     errorCount += 1
@@ -264,9 +260,7 @@ public final class MessageSender : NSObject {
         // Set the failure handler (need it here already for precondition failure handling)
         func handleFailure(with error: Swift.Error, using transaction: YapDatabaseReadWriteTransaction) {
             MessageSender.handleFailedMessageSend(message, with: error, using: transaction)
-            transaction.addCompletionQueue(DispatchQueue.main) {
-                seal.reject(error)
-            }
+            seal.reject(error)
         }
         // Validate the message
         guard let message = message as? VisibleMessage else {
@@ -291,9 +285,8 @@ public final class MessageSender : NSObject {
             message.openGroupServerMessageID = openGroupMessage.serverID
             storage.withAsync({ transaction in
                 MessageSender.handleSuccessfulMessageSend(message, to: destination, using: transaction)
-            }, completion: {
                 seal.fulfill(())
-            })
+            }, completion: { })
         }.catch(on: DispatchQueue.global(qos: .userInitiated)) { error in
             storage.withAsync({ transaction in
                 handleFailure(with: error, using: transaction as! YapDatabaseReadWriteTransaction)
diff --git a/SignalUtilitiesKit/OWSUDManager.swift b/SignalUtilitiesKit/OWSUDManager.swift
index f9a5106b9..080ec0f32 100644
--- a/SignalUtilitiesKit/OWSUDManager.swift
+++ b/SignalUtilitiesKit/OWSUDManager.swift
@@ -355,7 +355,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
     private func generateSenderCertificate() -> Promise<(certificateData: Data, certificate: SMKSenderCertificate)> {
         return Promise<(certificateData: Data, certificate: SMKSenderCertificate)> { seal in
             // Loki: Generate a sender certificate locally
-            let sender = OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey
+            guard let sender = OWSIdentityManager.shared().identityKeyPair()?.hexEncodedPublicKey else { seal.reject(OWSUDError.assertionError(description: "")); return }
             let certificate = SMKSenderCertificate(senderDeviceId: 1, senderRecipientId: sender)
             let certificateAsData = try certificate.serialized()
             guard isValidCertificate(certificate) else {