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

More wholesale conversion to promises

Browse source
This commit is contained in:
Matt Corallo 2014-05-09 03:20:54 -04:00
parent efe2fa1021
commit 905357a2e1
4 changed files with 109 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/helpers.js
View file

@ -471,7 +471,7 @@ function subscribeToPush(message_callback) {
// b) we should handle them gracefully and tell the user they received an invalid message
console.log("Successfully decoded message with id: " + message.id);
socket.send(JSON.stringify({type: 1, id: message.id}));
crypto.handleIncomingPushMessageProto(proto, function(decrypted) {
crypto.handleIncomingPushMessageProto(proto).then(function(decrypted) {
storeMessage(decrypted);
message_callback(decrypted);
}); // Decrypts/decodes/fills in fields/etc
@ -524,7 +524,7 @@ function sendMessageToDevices(number, deviceObjectList, message, success_callbac
var addEncryptionFor;
addEncryptionFor = function(i) {
crypto.encryptMessageFor(deviceObjectList[i], message, function(encryptedMsg) {
crypto.encryptMessageFor(deviceObjectList[i], message).then(function(encryptedMsg) {
jsonData[i] = {
type: encryptedMsg.type,
destination: deviceObjectList[i].encodedNumber,