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

Use the proper method for pulling attachments off disk for retry

Browse source
This commit is contained in:
Scott Nonnenberg 2019-01-28 15:24:19 -08:00
parent c936859d09
commit 92c071e083
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/modules/signal.js
View file

@ -124,8 +124,8 @@ function initializeMigrations({
const attachmentsPath = getPath(userDataPath); const attachmentsPath = getPath(userDataPath);
const readAttachmentData = createReader(attachmentsPath); const readAttachmentData = createReader(attachmentsPath);
const loadAttachmentData = Type.loadData(readAttachmentData); const loadAttachmentData = Type.loadData(readAttachmentData);
const loadPreviewData = MessageType.loadPreviewData(readAttachmentData); const loadPreviewData = MessageType.loadPreviewData(loadAttachmentData);
const loadQuoteData = MessageType.loadQuoteData(readAttachmentData); const loadQuoteData = MessageType.loadQuoteData(loadAttachmentData);
const getAbsoluteAttachmentPath = createAbsolutePathGetter(attachmentsPath); const getAbsoluteAttachmentPath = createAbsolutePathGetter(attachmentsPath);
const deleteOnDisk = Attachments.createDeleter(attachmentsPath); const deleteOnDisk = Attachments.createDeleter(attachmentsPath);

10
js/modules/types/message.js
View file

@ -469,14 +469,14 @@ exports.loadPreviewData = loadAttachmentData => {
} }
return Promise.all( return Promise.all(
preview.map(async () => { preview.map(async item => {
if (!preview.image) { if (!item.image) {
return preview; return item;
} }
return { return {
...preview, ...item,
image: await loadAttachmentData(preview.image), image: await loadAttachmentData(item.image),
}; };
}) })
); );