From d01f43147af6dd4a596b30d0b64f8b7730688ced Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 27 Nov 2020 10:29:27 +1100
Subject: [PATCH] Debug

---
 SessionMessagingKit/Jobs/JobQueue.swift       | 2 --
 SessionMessagingKit/Jobs/MessageSendJob.swift | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SessionMessagingKit/Jobs/JobQueue.swift b/SessionMessagingKit/Jobs/JobQueue.swift
index 09bb07d61..e80060aa8 100644
--- a/SessionMessagingKit/Jobs/JobQueue.swift
+++ b/SessionMessagingKit/Jobs/JobQueue.swift
@@ -1,7 +1,5 @@
 import SessionUtilitiesKit
 
-// TODO: Check that retrying works
-
 @objc(SNJobQueue)
 public final class JobQueue : NSObject, JobDelegate {
     private var hasResumedPendingJobs = false // Just for debugging
diff --git a/SessionMessagingKit/Jobs/MessageSendJob.swift b/SessionMessagingKit/Jobs/MessageSendJob.swift
index 893142ec1..73255910a 100644
--- a/SessionMessagingKit/Jobs/MessageSendJob.swift
+++ b/SessionMessagingKit/Jobs/MessageSendJob.swift
@@ -61,11 +61,9 @@ public final class MessageSendJob : NSObject, Job, NSCoding { // NSObject/NSCodi
 
     // MARK: Running
     public func execute() {
-        if Double.random(in: 0..<1) > 0.01 {
-            return handleFailure(error: MessageSender.Error.noThread)
-        }
         let storage = Configuration.shared.storage
         if let message = message as? VisibleMessage {
+            guard TSOutgoingMessage.find(withTimestamp: message.sentTimestamp!) != nil else { return } // The message has been deleted
             let attachments = message.attachmentIDs.compactMap { TSAttachmentStream.fetch(uniqueId: $0) }
             let attachmentsToUpload = attachments.filter { !$0.isUploaded }
             attachmentsToUpload.forEach { attachment in
@@ -104,6 +102,10 @@ public final class MessageSendJob : NSObject, Job, NSCoding { // NSObject/NSCodi
     }
 
     private func handleFailure(error: Error) {
+        SNLog("Failed to send \(type(of: message)).")
+        if let message = message as? VisibleMessage {
+            guard TSOutgoingMessage.find(withTimestamp: message.sentTimestamp!) != nil else { return } // The message has been deleted
+        }
         delegate?.handleJobFailed(self, with: error)
     }
 }