From 5954c109a1ca290cc7302aac5dca262daf8daa2e Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 23 Feb 2022 10:09:14 +1100 Subject: [PATCH] Fix an issue where message would be sent even though the attachments are failed to upload --- .../MessageSender+Convenience.swift | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/SignalUtilitiesKit/Messaging/Sending & Receiving/MessageSender+Convenience.swift b/SignalUtilitiesKit/Messaging/Sending & Receiving/MessageSender+Convenience.swift index 3297ce14e..af4f0d7e5 100644 --- a/SignalUtilitiesKit/Messaging/Sending & Receiving/MessageSender+Convenience.swift +++ b/SignalUtilitiesKit/Messaging/Sending & Receiving/MessageSender+Convenience.swift @@ -91,12 +91,15 @@ extension MessageSender { let errors = results.compactMap { result -> Swift.Error? in if case .rejected(let error) = result { return error } else { return nil } } - if let error = errors.first { seal.reject(error) } - Storage.write{ transaction in - sendNonDurably(message, in: thread, using: transaction).done { - seal.fulfill(()) - }.catch { error in - seal.reject(error) + if let error = errors.first { + seal.reject(error) + } else { + Storage.write{ transaction in + sendNonDurably(message, in: thread, using: transaction).done { + seal.fulfill(()) + }.catch { error in + seal.reject(error) + } } } return promise