mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Erased messages should not stall attachment jobs

Browse source
This commit is contained in:
Fedor Indutny 2022-06-06 15:13:21 -07:00 committed by GitHub
parent 10a0abb8c2
commit 6476a4fe73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ts/messageModifiers/AttachmentDownloads.ts
View file

@ -286,12 +286,15 @@ async function _runJob(job?: AttachmentDownloadJobType): Promise<void> {
Errors.toLogFormat(error) Errors.toLogFormat(error)
); );
try {
await _addAttachmentToMessage( await _addAttachmentToMessage(
message, message,
_markAttachmentAsTransientError(attachment), _markAttachmentAsTransientError(attachment),
{ type, index } { type, index }
); );
} finally {
await _finishJob(message, id); await _finishJob(message, id);
}
return; return;
} }
@ -302,6 +305,7 @@ async function _runJob(job?: AttachmentDownloadJobType): Promise<void> {
Errors.toLogFormat(error) Errors.toLogFormat(error)
); );
try {
// Remove `pending` flag from the attachment. // Remove `pending` flag from the attachment.
await _addAttachmentToMessage( await _addAttachmentToMessage(
message, message,
@ -326,9 +330,11 @@ async function _runJob(job?: AttachmentDownloadJobType): Promise<void> {
}; };
await saveAttachmentDownloadJob(failedJob); await saveAttachmentDownloadJob(failedJob);
} finally {
delete _activeAttachmentDownloadJobs[id]; delete _activeAttachmentDownloadJobs[id];
_maybeStartJob(); _maybeStartJob();
} }
}
} }
async function _finishJob( async function _finishJob(