Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 04:09:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move async attachment processing to onMessageReceived

Browse Source 
We previously processed attachments in `handleDataMessage` which is mostly a synchronous
function, except for the saving of the model. Moving the processing into the already async
`onMessageReceived` improves code clarity.
This commit is contained in:
Daniel Gasienica
2018-02-13 09:16:23 -05:00
parent be6ca2a9aa
commit e6d1cf826b
2 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
js/background.js
View File

@@ -4,6 +4,9 @@
;(function() {
'use strict';
const { Attachment } = window.Whisper;
window.onInvalidStateError = function(e) {
console.log(e);
};
@@ -479,38 +482,47 @@
});
}
function onMessageReceived(ev) {
var data = ev.data;
async function onMessageReceived(ev) {
const { data } = ev;
if (data.message.flags & textsecure.protobuf.DataMessage.Flags.PROFILE_KEY_UPDATE) {
var profileKey = data.message.profileKey.toArrayBuffer();
return ConversationController.getOrCreateAndWait(data.source, 'private').then(function(sender) {
return sender.setProfileKey(profileKey).then(ev.confirm);
});
const profileKey = data.message.profileKey.toArrayBuffer();
const sender = ConversationController.getOrCreateAndWait(data.source, 'private');
await sender.setProfileKey(profileKey);
// TODO: Is `ev.confirm` a `Promise`? Original code returned it:
return ev.confirm();
}
var message = initIncomingMessage(data);
return isMessageDuplicate(message).then(function(isDuplicate) {
if (isDuplicate) {
console.log('Received duplicate message', message.idForLogging());
ev.confirm();
return;
}
const message = initIncomingMessage(data);
const isDuplicate = await isMessageDuplicate(message);
if (isDuplicate) {
console.log('Received duplicate message', message.idForLogging());
// TODO: Is `ev.confirm` a `Promise`? Original code didn’t return it:
return ev.confirm();
}
var type, id;
if (data.message.group) {
type = 'group';
id = data.message.group.id;
} else {
type = 'private';
id = data.source;
}
const { type, id } = data.message.group ?
{ type: 'group', id: data.message.group.id } :
{ type: 'private', id: data.source };
return ConversationController.getOrCreateAndWait(id, type).then(function() {
return message.handleDataMessage(data.message, ev.confirm, {
initialLoadComplete: initialLoadComplete
});
});
const processedData = Object.assign({}, data, {
message: Object.assign(
{},
data.message,
{
attachments: await Promise.all(
data.message.attachments.map(Attachment.process)
),
}
),
});
await ConversationController.getOrCreateAndWait(id, type);
return message.handleDataMessage(
processedData.message,
ev.confirm,
{ initialLoadComplete }
);
}
function onSentMessage(ev) {