Merge pull request #794 from RyanRory/fix-database-reentrance

Fix a crash caused by database write method reentrance
pull/796/head
RyanZhao 2 years ago committed by GitHub
commit 98fd315661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -747,21 +747,19 @@ public final class MessageSender {
if let message = message as? VisibleMessage { message.syncTarget = publicKey } if let message = message as? VisibleMessage { message.syncTarget = publicKey }
if let message = message as? ExpirationTimerUpdate { message.syncTarget = publicKey } if let message = message as? ExpirationTimerUpdate { message.syncTarget = publicKey }
Storage.shared.write { db in JobRunner.add(
JobRunner.add( db,
db, job: Job(
job: Job( variant: .messageSend,
variant: .messageSend, threadId: threadId,
threadId: threadId, interactionId: interactionId,
interactionId: interactionId, details: MessageSendJob.Details(
details: MessageSendJob.Details( destination: .contact(publicKey: currentUserPublicKey),
destination: .contact(publicKey: currentUserPublicKey), message: message,
message: message, isSyncMessage: true
isSyncMessage: true
)
) )
) )
} )
} }
} }
} }

Loading…
Cancel
Save