From b277056a624c8a84db267de03e57208555e6a2b2 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Tue, 23 May 2023 15:09:11 +1000 Subject: [PATCH] Removed the extra debug logs for message sending --- Session/Conversations/ConversationVC+Interaction.swift | 4 +--- SessionMessagingKit/Database/Models/Interaction.swift | 1 - SessionMessagingKit/Jobs/Types/MessageSendJob.swift | 1 - .../Sending & Receiving/MessageSender+Convenience.swift | 2 +- SessionMessagingKit/Sending & Receiving/MessageSender.swift | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 2b8ce7cf0..715a4ab34 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -608,9 +608,7 @@ extension ConversationVC: .fetchOne(db) ).inserted(db) - guard let interactionId: Int64 = interaction.id else { - return - } + guard let interactionId: Int64 = interaction.id else { return } // Prepare any attachments try Attachment.prepare( diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift index d89430dd9..21fdd5456 100644 --- a/SessionMessagingKit/Database/Models/Interaction.swift +++ b/SessionMessagingKit/Database/Models/Interaction.swift @@ -421,7 +421,6 @@ public struct Interaction: Codable, Identifiable, Equatable, FetchableRecord, Mu } public mutating func didInsert(_ inserted: InsertionSuccess) { - SNLog("[MessageSendDebugging] didInsert interaction for id: \(inserted.rowID)") self.id = inserted.rowID } } diff --git a/SessionMessagingKit/Jobs/Types/MessageSendJob.swift b/SessionMessagingKit/Jobs/Types/MessageSendJob.swift index 70ff6d98b..8e97addcd 100644 --- a/SessionMessagingKit/Jobs/Types/MessageSendJob.swift +++ b/SessionMessagingKit/Jobs/Types/MessageSendJob.swift @@ -55,7 +55,6 @@ public enum MessageSendJob: JobExecutor { // message was deleted before it even got sent) guard Storage.shared.read({ db in try Interaction.exists(db, id: interactionId) }) == true else { SNLog("[MessageSendJob] Failing due to missing interaction") - SNLog("[MessageSendDebugging] Failed with interactionId \(interactionId)") failure(job, StorageError.objectNotFound, true) return } diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift b/SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift index 0373b0b4f..4c6421b34 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift @@ -69,7 +69,7 @@ extension MessageSender { ) return } - SNLog("[MessageSendDebugging] Add send job for interactionId: \(interactionId)\n\(Thread.callStackSymbols)") + JobRunner.add( db, job: Job( diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index 4385d8e41..1da13d3ec 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -1073,7 +1073,7 @@ public final class MessageSender { { if let message = message as? VisibleMessage { message.syncTarget = publicKey } if let message = message as? ExpirationTimerUpdate { message.syncTarget = publicKey } - SNLog("[MessageSendDebugging] Send sync message for interactionId \(interactionId)") + JobRunner.add( db, job: Job(