Fixed bug: stale transaction on delayed resend

2021-08-04 21:22:22 -07:00 · 2021-08-04 21:22:22 -07:00 · e95b0a8dba
commit e95b0a8dba
parent 0e8fe169a4
1 changed files with 8 additions and 4 deletions
--- a/SignalServiceKit/src/Messages/OWSMessageManager.swift
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.swift
@ -99,16 +99,20 @@ extension OWSMessageManager {
                transaction: writeTx
            )

-            let sendBlock = {
+            let sendBlock = { (transaction: SDSAnyWriteTransaction) in
                if let resendResponse = resendResponse {
-                    Self.messageSenderJobQueue.add(message: resendResponse.asPreparer, transaction: writeTx)
+                    Self.messageSenderJobQueue.add(message: resendResponse.asPreparer, transaction: transaction)
                }
            }

            if DebugFlags.delayedMessageResend.get() {
-                DispatchQueue.sharedUtility.asyncAfter(deadline: .now() + 10, execute: sendBlock)
+                DispatchQueue.sharedUtility.asyncAfter(deadline: .now() + 10) {
+                    Self.databaseStorage.asyncWrite { writeTx in
+                        sendBlock(writeTx)
+                    }
+                }
            } else {
-                sendBlock()
+                sendBlock(writeTx)
            }

        } catch {