colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load attachments before writing them upon export

Browse Source
This commit is contained in:
Daniel Gasienica
2018-04-03 21:16:24 -04:00
parent 7eeabb5b1a
commit 43ab320d31
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/modules/backup.js
View File

@@ -506,9 +506,11 @@ async function writeAttachment(attachment, options) {
await stream.close();
}
async function writeAttachments(attachments, options) {
async function writeAttachments(rawAttachments, options) {
const { name } = options;
const { loadAttachmentData } = Signal.Migrations;
const attachments = await Promise.all(rawAttachments.map(loadAttachmentData));
const promises = _.map(
attachments,
(attachment, index) => writeAttachment(attachment, Object.assign({}, options, {
@@ -626,7 +628,7 @@ async function exportConversation(db, conversation, options) {
const jsonString = JSON.stringify(stringify(message));
stream.write(jsonString);
if (attachments && attachments.length) {
if (attachments && attachments.length > 0) {
const exportAttachments = () => writeAttachments(attachments, {
dir: attachmentsDir,
name,