|
|
|
@ -21,20 +21,26 @@ public enum FailedMessageSendsJob: JobExecutor {
|
|
|
|
|
var attachmentChangeCount: Int = -1
|
|
|
|
|
|
|
|
|
|
// Update all 'sending' message states to 'failed'
|
|
|
|
|
dependencies.storage.write { db in
|
|
|
|
|
let sendChangeCount: Int = try RecipientState
|
|
|
|
|
.filter(RecipientState.Columns.state == RecipientState.State.sending)
|
|
|
|
|
.updateAll(db, RecipientState.Columns.state.set(to: RecipientState.State.failed))
|
|
|
|
|
let syncChangeCount: Int = try RecipientState
|
|
|
|
|
.filter(RecipientState.Columns.state == RecipientState.State.syncing)
|
|
|
|
|
.updateAll(db, RecipientState.Columns.state.set(to: RecipientState.State.failedToSync))
|
|
|
|
|
attachmentChangeCount = try Attachment
|
|
|
|
|
.filter(Attachment.Columns.state == Attachment.State.uploading)
|
|
|
|
|
.updateAll(db, Attachment.Columns.state.set(to: Attachment.State.failedUpload))
|
|
|
|
|
changeCount = (sendChangeCount + syncChangeCount)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SNLog("[FailedMessageSendsJob] Marked \(changeCount) message\(changeCount == 1 ? "" : "s") as failed (\(attachmentChangeCount) upload\(attachmentChangeCount == 1 ? "" : "s") cancelled)")
|
|
|
|
|
success(job, false, dependencies)
|
|
|
|
|
dependencies.storage
|
|
|
|
|
.writePublisher(using: dependencies) { db in
|
|
|
|
|
let sendChangeCount: Int = try RecipientState
|
|
|
|
|
.filter(RecipientState.Columns.state == RecipientState.State.sending)
|
|
|
|
|
.updateAll(db, RecipientState.Columns.state.set(to: RecipientState.State.failed))
|
|
|
|
|
let syncChangeCount: Int = try RecipientState
|
|
|
|
|
.filter(RecipientState.Columns.state == RecipientState.State.syncing)
|
|
|
|
|
.updateAll(db, RecipientState.Columns.state.set(to: RecipientState.State.failedToSync))
|
|
|
|
|
attachmentChangeCount = try Attachment
|
|
|
|
|
.filter(Attachment.Columns.state == Attachment.State.uploading)
|
|
|
|
|
.updateAll(db, Attachment.Columns.state.set(to: Attachment.State.failedUpload))
|
|
|
|
|
changeCount = (sendChangeCount + syncChangeCount)
|
|
|
|
|
}
|
|
|
|
|
.subscribe(on: queue, using: dependencies)
|
|
|
|
|
.receive(on: queue, using: dependencies)
|
|
|
|
|
.sinkUntilComplete(
|
|
|
|
|
receiveCompletion: { _ in
|
|
|
|
|
SNLog("[FailedMessageSendsJob] Marked \(changeCount) message\(changeCount == 1 ? "" : "s") as failed (\(attachmentChangeCount) upload\(attachmentChangeCount == 1 ? "" : "s") cancelled)")
|
|
|
|
|
success(job, false, dependencies)
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|