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

Commit broken attachment loader (S3 403s I can't figure out...)

Browse source
This commit is contained in:
Matt Corallo 2014-05-15 00:26:37 -04:00
parent ea1bd535dc
commit 3103eaa192
3 changed files with 72 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
js/helpers.js
View file

@ -463,8 +463,22 @@ function subscribeToPush(message_callback) {
console.log("Successfully decoded message with id: " + message.id);
socket.send(JSON.stringify({type: 1, id: message.id}));
return crypto.handleIncomingPushMessageProto(proto).then(function(decrypted) {
storeMessage(decrypted);
message_callback(decrypted);
var handleAttachment = function(attachment) {
return API.getAttachment(attachment.id).then(function(encryptedBin) {
return crypto.decryptAttachment(encryptedBin, attachment.key).then(function(decryptedBin) {
attachment.decrypted = decryptedBin;
});
});
};
var promises = [];
for (var i = 0; i < decrypted.message.attachments.length; i++) {
promises[i] = handleAttachment(decrypted.message.attachments[i]);
}
return Promise.all(promises).then(function() {
storeMessage(decrypted);
message_callback(decrypted);
});
})
}).catch(function(e) {
console.log("Error handling incoming message: ");