Move handleAttachment and processDecrypted
Make these internal methods on MessageReceiver. Todo: refactor identity key errors to use a given message receiver. // FREEBIE
This commit is contained in:
lilia
parent
a8f4bac2f7
commit
c8a1e090d2
|
|
@ -38628,114 +38628,6 @@ window.textsecure.utils = function() {
|
|||
return self;
|
||||
}();
|
||||
|
||||
function handleAttachment(attachment) {
|
||||
function getAttachment() {
|
||||
return TextSecureServer.getAttachment(attachment.id.toString());
|
||||
}
|
||||
|
||||
function decryptAttachment(encrypted) {
|
||||
return textsecure.crypto.decryptAttachment(
|
||||
encrypted,
|
||||
attachment.key.toArrayBuffer()
|
||||
);
|
||||
}
|
||||
|
||||
function updateAttachment(data) {
|
||||
attachment.data = data;
|
||||
}
|
||||
|
||||
return getAttachment().
|
||||
then(decryptAttachment).
|
||||
then(updateAttachment);
|
||||
}
|
||||
|
||||
function processDecrypted(decrypted, source) {
|
||||
|
||||
// Now that its decrypted, validate the message and clean it up for consumer processing
|
||||
// Note that messages may (generally) only perform one action and we ignore remaining fields
|
||||
// after the first action.
|
||||
|
||||
if (decrypted.flags == null)
|
||||
decrypted.flags = 0;
|
||||
|
||||
if ((decrypted.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION)
|
||||
== textsecure.protobuf.DataMessage.Flags.END_SESSION) {
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
decrypted.group = null;
|
||||
return Promise.resolve(decrypted);
|
||||
}
|
||||
if (decrypted.flags != 0) {
|
||||
throw new Error("Unknown flags in message");
|
||||
}
|
||||
|
||||
var promises = [];
|
||||
|
||||
if (decrypted.group !== null) {
|
||||
decrypted.group.id = getString(decrypted.group.id);
|
||||
|
||||
if (decrypted.group.type == textsecure.protobuf.GroupContext.Type.UPDATE) {
|
||||
if (decrypted.group.avatar !== null) {
|
||||
promises.push(handleAttachment(decrypted.group.avatar));
|
||||
}
|
||||
}
|
||||
|
||||
promises.push(textsecure.storage.groups.getNumbers(decrypted.group.id).then(function(existingGroup) {
|
||||
if (existingGroup === undefined) {
|
||||
if (decrypted.group.type != textsecure.protobuf.GroupContext.Type.UPDATE) {
|
||||
throw new Error("Got message for unknown group");
|
||||
}
|
||||
return textsecure.storage.groups.createNewGroup(decrypted.group.members, decrypted.group.id);
|
||||
} else {
|
||||
var fromIndex = existingGroup.indexOf(source);
|
||||
|
||||
if (fromIndex < 0) {
|
||||
//TODO: This could be indication of a race...
|
||||
throw new Error("Sender was not a member of the group they were sending from");
|
||||
}
|
||||
|
||||
switch(decrypted.group.type) {
|
||||
case textsecure.protobuf.GroupContext.Type.UPDATE:
|
||||
return textsecure.storage.groups.updateNumbers(
|
||||
decrypted.group.id, decrypted.group.members
|
||||
).then(function(added) {
|
||||
decrypted.group.added = added;
|
||||
|
||||
if (decrypted.group.avatar === null &&
|
||||
decrypted.group.added.length == 0 &&
|
||||
decrypted.group.name === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
});
|
||||
|
||||
break;
|
||||
case textsecure.protobuf.GroupContext.Type.QUIT:
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
return textsecure.storage.groups.removeNumber(decrypted.group.id, source);
|
||||
case textsecure.protobuf.GroupContext.Type.DELIVER:
|
||||
decrypted.group.name = null;
|
||||
decrypted.group.members = [];
|
||||
decrypted.group.avatar = null;
|
||||
|
||||
break;
|
||||
default:
|
||||
throw new Error("Unknown group message type");
|
||||
}
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
for (var i in decrypted.attachments) {
|
||||
promises.push(handleAttachment(decrypted.attachments[i]));
|
||||
}
|
||||
return Promise.all(promises).then(function() {
|
||||
return decrypted;
|
||||
});
|
||||
}
|
||||
|
||||
/*
|
||||
* vim: ts=4:sw=4:expandtab
|
||||
|
|
@ -39289,11 +39181,7 @@ var TextSecureServer = (function() {
|
|||
* vim: ts=4:sw=4:expandtab
|
||||
*/
|
||||
|
||||
;(function () {
|
||||
'use strict';
|
||||
window.textsecure = window.textsecure || {};
|
||||
|
||||
function MessageReceiver(url, username, password, signalingKey) {
|
||||
function MessageReceiver(url, username, password, signalingKey) {
|
||||
this.url = url;
|
||||
this.signalingKey = signalingKey;
|
||||
this.username = username;
|
||||
|
|
@ -39303,10 +39191,8 @@ var TextSecureServer = (function() {
|
|||
var unencoded = textsecure.utils.unencodeNumber(username);
|
||||
this.number = unencoded[0];
|
||||
this.deviceId = unencoded[1];
|
||||
this.connect();
|
||||
}
|
||||
|
||||
MessageReceiver.prototype = {
|
||||
}
|
||||
MessageReceiver.prototype = {
|
||||
constructor: MessageReceiver,
|
||||
connect: function() {
|
||||
if (this.socket && this.socket.readyState !== WebSocket.CLOSED) {
|
||||
|
|
@ -39401,7 +39287,7 @@ var TextSecureServer = (function() {
|
|||
}.bind(this));
|
||||
},
|
||||
handleSentMessage: function(destination, timestamp, message) {
|
||||
return processDecrypted(message, this.number).then(function(message) {
|
||||
return this.processDecrypted(message, this.number).then(function(message) {
|
||||
var ev = new Event('sent');
|
||||
ev.data = {
|
||||
destination : destination,
|
||||
|
|
@ -39416,7 +39302,7 @@ var TextSecureServer = (function() {
|
|||
textsecure.protobuf.DataMessage.Flags.END_SESSION ) {
|
||||
close_session();
|
||||
}
|
||||
return processDecrypted(message, envelope.source).then(function(message) {
|
||||
return this.processDecrypted(message, envelope.source).then(function(message) {
|
||||
var ev = new Event('message');
|
||||
ev.data = {
|
||||
source : envelope.source,
|
||||
|
|
@ -39473,7 +39359,7 @@ var TextSecureServer = (function() {
|
|||
handleContacts: function(contacts) {
|
||||
var eventTarget = this;
|
||||
var attachmentPointer = contacts.blob;
|
||||
return handleAttachment(attachmentPointer).then(function() {
|
||||
return this.handleAttachment(attachmentPointer).then(function() {
|
||||
var contactBuffer = new ContactBuffer(attachmentPointer.data);
|
||||
var contactDetails = contactBuffer.next();
|
||||
while (contactDetails !== undefined) {
|
||||
|
|
@ -39488,7 +39374,7 @@ var TextSecureServer = (function() {
|
|||
handleGroups: function(groups) {
|
||||
var eventTarget = this;
|
||||
var attachmentPointer = groups.blob;
|
||||
return handleAttachment(attachmentPointer).then(function() {
|
||||
return this.handleAttachment(attachmentPointer).then(function() {
|
||||
var groupBuffer = new GroupBuffer(attachmentPointer.data);
|
||||
var groupDetails = groupBuffer.next();
|
||||
while (groupDetails !== undefined) {
|
||||
|
|
@ -39515,6 +39401,108 @@ var TextSecureServer = (function() {
|
|||
}
|
||||
});
|
||||
},
|
||||
handleAttachment: function(attachment) {
|
||||
function decryptAttachment(encrypted) {
|
||||
return textsecure.crypto.decryptAttachment(
|
||||
encrypted,
|
||||
attachment.key.toArrayBuffer()
|
||||
);
|
||||
}
|
||||
|
||||
function updateAttachment(data) {
|
||||
attachment.data = data;
|
||||
}
|
||||
|
||||
return this.server.getAttachment(attachment.id.toString()).
|
||||
then(decryptAttachment).
|
||||
then(updateAttachment);
|
||||
},
|
||||
processDecrypted: function(decrypted, source) {
|
||||
// Now that its decrypted, validate the message and clean it up for consumer processing
|
||||
// Note that messages may (generally) only perform one action and we ignore remaining fields
|
||||
// after the first action.
|
||||
|
||||
if (decrypted.flags == null)
|
||||
decrypted.flags = 0;
|
||||
|
||||
if ((decrypted.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION)
|
||||
== textsecure.protobuf.DataMessage.Flags.END_SESSION) {
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
decrypted.group = null;
|
||||
return Promise.resolve(decrypted);
|
||||
}
|
||||
if (decrypted.flags != 0) {
|
||||
throw new Error("Unknown flags in message");
|
||||
}
|
||||
|
||||
var promises = [];
|
||||
|
||||
if (decrypted.group !== null) {
|
||||
decrypted.group.id = getString(decrypted.group.id);
|
||||
|
||||
if (decrypted.group.type == textsecure.protobuf.GroupContext.Type.UPDATE) {
|
||||
if (decrypted.group.avatar !== null) {
|
||||
promises.push(this.handleAttachment(decrypted.group.avatar));
|
||||
}
|
||||
}
|
||||
|
||||
promises.push(textsecure.storage.groups.getNumbers(decrypted.group.id).then(function(existingGroup) {
|
||||
if (existingGroup === undefined) {
|
||||
if (decrypted.group.type != textsecure.protobuf.GroupContext.Type.UPDATE) {
|
||||
throw new Error("Got message for unknown group");
|
||||
}
|
||||
return textsecure.storage.groups.createNewGroup(decrypted.group.members, decrypted.group.id);
|
||||
} else {
|
||||
var fromIndex = existingGroup.indexOf(source);
|
||||
|
||||
if (fromIndex < 0) {
|
||||
//TODO: This could be indication of a race...
|
||||
throw new Error("Sender was not a member of the group they were sending from");
|
||||
}
|
||||
|
||||
switch(decrypted.group.type) {
|
||||
case textsecure.protobuf.GroupContext.Type.UPDATE:
|
||||
return textsecure.storage.groups.updateNumbers(
|
||||
decrypted.group.id, decrypted.group.members
|
||||
).then(function(added) {
|
||||
decrypted.group.added = added;
|
||||
|
||||
if (decrypted.group.avatar === null &&
|
||||
decrypted.group.added.length == 0 &&
|
||||
decrypted.group.name === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
});
|
||||
|
||||
break;
|
||||
case textsecure.protobuf.GroupContext.Type.QUIT:
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
return textsecure.storage.groups.removeNumber(decrypted.group.id, source);
|
||||
case textsecure.protobuf.GroupContext.Type.DELIVER:
|
||||
decrypted.group.name = null;
|
||||
decrypted.group.members = [];
|
||||
decrypted.group.avatar = null;
|
||||
|
||||
break;
|
||||
default:
|
||||
throw new Error("Unknown group message type");
|
||||
}
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
for (var i in decrypted.attachments) {
|
||||
promises.push(this.handleAttachment(decrypted.attachments[i]));
|
||||
}
|
||||
return Promise.all(promises).then(function() {
|
||||
return decrypted;
|
||||
});
|
||||
},
|
||||
|
||||
/* Implements EventTarget */
|
||||
dispatchEvent: function(ev) {
|
||||
|
|
@ -39570,22 +39558,23 @@ var TextSecureServer = (function() {
|
|||
this.listeners[eventName] = listeners;
|
||||
}
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
textsecure.MessageReceiver = function(url, username, password, signalingKey) {
|
||||
window.textsecure = window.textsecure || {};
|
||||
|
||||
textsecure.MessageReceiver = function(url, username, password, signalingKey) {
|
||||
var messageReceiver = new MessageReceiver(url, username, password, signalingKey);
|
||||
|
||||
this.addEventListener = messageReceiver.addEventListener.bind(messageReceiver);
|
||||
this.removeEventListener = messageReceiver.removeEventListener.bind(messageReceiver);
|
||||
this.getStatus = messageReceiver.getStatus.bind(messageReceiver);
|
||||
this.close = messageReceiver.close.bind(messageReceiver);
|
||||
};
|
||||
messageReceiver.connect();
|
||||
};
|
||||
|
||||
textsecure.MessageReceiver.prototype = {
|
||||
textsecure.MessageReceiver.prototype = {
|
||||
constructor: textsecure.MessageReceiver
|
||||
};
|
||||
};
|
||||
|
||||
}());
|
||||
|
||||
/*
|
||||
* vim: ts=4:sw=4:expandtab
|
||||
|
|
|
|||
|
|
@ -113,111 +113,3 @@ window.textsecure.utils = function() {
|
|||
return self;
|
||||
}();
|
||||
|
||||
function handleAttachment(attachment) {
|
||||
function getAttachment() {
|
||||
return TextSecureServer.getAttachment(attachment.id.toString());
|
||||
}
|
||||
|
||||
function decryptAttachment(encrypted) {
|
||||
return textsecure.crypto.decryptAttachment(
|
||||
encrypted,
|
||||
attachment.key.toArrayBuffer()
|
||||
);
|
||||
}
|
||||
|
||||
function updateAttachment(data) {
|
||||
attachment.data = data;
|
||||
}
|
||||
|
||||
return getAttachment().
|
||||
then(decryptAttachment).
|
||||
then(updateAttachment);
|
||||
}
|
||||
|
||||
function processDecrypted(decrypted, source) {
|
||||
|
||||
// Now that its decrypted, validate the message and clean it up for consumer processing
|
||||
// Note that messages may (generally) only perform one action and we ignore remaining fields
|
||||
// after the first action.
|
||||
|
||||
if (decrypted.flags == null)
|
||||
decrypted.flags = 0;
|
||||
|
||||
if ((decrypted.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION)
|
||||
== textsecure.protobuf.DataMessage.Flags.END_SESSION) {
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
decrypted.group = null;
|
||||
return Promise.resolve(decrypted);
|
||||
}
|
||||
if (decrypted.flags != 0) {
|
||||
throw new Error("Unknown flags in message");
|
||||
}
|
||||
|
||||
var promises = [];
|
||||
|
||||
if (decrypted.group !== null) {
|
||||
decrypted.group.id = getString(decrypted.group.id);
|
||||
|
||||
if (decrypted.group.type == textsecure.protobuf.GroupContext.Type.UPDATE) {
|
||||
if (decrypted.group.avatar !== null) {
|
||||
promises.push(handleAttachment(decrypted.group.avatar));
|
||||
}
|
||||
}
|
||||
|
||||
promises.push(textsecure.storage.groups.getNumbers(decrypted.group.id).then(function(existingGroup) {
|
||||
if (existingGroup === undefined) {
|
||||
if (decrypted.group.type != textsecure.protobuf.GroupContext.Type.UPDATE) {
|
||||
throw new Error("Got message for unknown group");
|
||||
}
|
||||
return textsecure.storage.groups.createNewGroup(decrypted.group.members, decrypted.group.id);
|
||||
} else {
|
||||
var fromIndex = existingGroup.indexOf(source);
|
||||
|
||||
if (fromIndex < 0) {
|
||||
//TODO: This could be indication of a race...
|
||||
throw new Error("Sender was not a member of the group they were sending from");
|
||||
}
|
||||
|
||||
switch(decrypted.group.type) {
|
||||
case textsecure.protobuf.GroupContext.Type.UPDATE:
|
||||
return textsecure.storage.groups.updateNumbers(
|
||||
decrypted.group.id, decrypted.group.members
|
||||
).then(function(added) {
|
||||
decrypted.group.added = added;
|
||||
|
||||
if (decrypted.group.avatar === null &&
|
||||
decrypted.group.added.length == 0 &&
|
||||
decrypted.group.name === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
});
|
||||
|
||||
break;
|
||||
case textsecure.protobuf.GroupContext.Type.QUIT:
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
return textsecure.storage.groups.removeNumber(decrypted.group.id, source);
|
||||
case textsecure.protobuf.GroupContext.Type.DELIVER:
|
||||
decrypted.group.name = null;
|
||||
decrypted.group.members = [];
|
||||
decrypted.group.avatar = null;
|
||||
|
||||
break;
|
||||
default:
|
||||
throw new Error("Unknown group message type");
|
||||
}
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
for (var i in decrypted.attachments) {
|
||||
promises.push(handleAttachment(decrypted.attachments[i]));
|
||||
}
|
||||
return Promise.all(promises).then(function() {
|
||||
return decrypted;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,7 @@
|
|||
* vim: ts=4:sw=4:expandtab
|
||||
*/
|
||||
|
||||
;(function () {
|
||||
'use strict';
|
||||
window.textsecure = window.textsecure || {};
|
||||
|
||||
function MessageReceiver(url, username, password, signalingKey) {
|
||||
function MessageReceiver(url, username, password, signalingKey) {
|
||||
this.url = url;
|
||||
this.signalingKey = signalingKey;
|
||||
this.username = username;
|
||||
|
|
@ -16,10 +12,8 @@
|
|||
var unencoded = textsecure.utils.unencodeNumber(username);
|
||||
this.number = unencoded[0];
|
||||
this.deviceId = unencoded[1];
|
||||
this.connect();
|
||||
}
|
||||
|
||||
MessageReceiver.prototype = {
|
||||
}
|
||||
MessageReceiver.prototype = {
|
||||
constructor: MessageReceiver,
|
||||
connect: function() {
|
||||
if (this.socket && this.socket.readyState !== WebSocket.CLOSED) {
|
||||
|
|
@ -114,7 +108,7 @@
|
|||
}.bind(this));
|
||||
},
|
||||
handleSentMessage: function(destination, timestamp, message) {
|
||||
return processDecrypted(message, this.number).then(function(message) {
|
||||
return this.processDecrypted(message, this.number).then(function(message) {
|
||||
var ev = new Event('sent');
|
||||
ev.data = {
|
||||
destination : destination,
|
||||
|
|
@ -129,7 +123,7 @@
|
|||
textsecure.protobuf.DataMessage.Flags.END_SESSION ) {
|
||||
close_session();
|
||||
}
|
||||
return processDecrypted(message, envelope.source).then(function(message) {
|
||||
return this.processDecrypted(message, envelope.source).then(function(message) {
|
||||
var ev = new Event('message');
|
||||
ev.data = {
|
||||
source : envelope.source,
|
||||
|
|
@ -186,7 +180,7 @@
|
|||
handleContacts: function(contacts) {
|
||||
var eventTarget = this;
|
||||
var attachmentPointer = contacts.blob;
|
||||
return handleAttachment(attachmentPointer).then(function() {
|
||||
return this.handleAttachment(attachmentPointer).then(function() {
|
||||
var contactBuffer = new ContactBuffer(attachmentPointer.data);
|
||||
var contactDetails = contactBuffer.next();
|
||||
while (contactDetails !== undefined) {
|
||||
|
|
@ -201,7 +195,7 @@
|
|||
handleGroups: function(groups) {
|
||||
var eventTarget = this;
|
||||
var attachmentPointer = groups.blob;
|
||||
return handleAttachment(attachmentPointer).then(function() {
|
||||
return this.handleAttachment(attachmentPointer).then(function() {
|
||||
var groupBuffer = new GroupBuffer(attachmentPointer.data);
|
||||
var groupDetails = groupBuffer.next();
|
||||
while (groupDetails !== undefined) {
|
||||
|
|
@ -228,6 +222,108 @@
|
|||
}
|
||||
});
|
||||
},
|
||||
handleAttachment: function(attachment) {
|
||||
function decryptAttachment(encrypted) {
|
||||
return textsecure.crypto.decryptAttachment(
|
||||
encrypted,
|
||||
attachment.key.toArrayBuffer()
|
||||
);
|
||||
}
|
||||
|
||||
function updateAttachment(data) {
|
||||
attachment.data = data;
|
||||
}
|
||||
|
||||
return this.server.getAttachment(attachment.id.toString()).
|
||||
then(decryptAttachment).
|
||||
then(updateAttachment);
|
||||
},
|
||||
processDecrypted: function(decrypted, source) {
|
||||
// Now that its decrypted, validate the message and clean it up for consumer processing
|
||||
// Note that messages may (generally) only perform one action and we ignore remaining fields
|
||||
// after the first action.
|
||||
|
||||
if (decrypted.flags == null)
|
||||
decrypted.flags = 0;
|
||||
|
||||
if ((decrypted.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION)
|
||||
== textsecure.protobuf.DataMessage.Flags.END_SESSION) {
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
decrypted.group = null;
|
||||
return Promise.resolve(decrypted);
|
||||
}
|
||||
if (decrypted.flags != 0) {
|
||||
throw new Error("Unknown flags in message");
|
||||
}
|
||||
|
||||
var promises = [];
|
||||
|
||||
if (decrypted.group !== null) {
|
||||
decrypted.group.id = getString(decrypted.group.id);
|
||||
|
||||
if (decrypted.group.type == textsecure.protobuf.GroupContext.Type.UPDATE) {
|
||||
if (decrypted.group.avatar !== null) {
|
||||
promises.push(this.handleAttachment(decrypted.group.avatar));
|
||||
}
|
||||
}
|
||||
|
||||
promises.push(textsecure.storage.groups.getNumbers(decrypted.group.id).then(function(existingGroup) {
|
||||
if (existingGroup === undefined) {
|
||||
if (decrypted.group.type != textsecure.protobuf.GroupContext.Type.UPDATE) {
|
||||
throw new Error("Got message for unknown group");
|
||||
}
|
||||
return textsecure.storage.groups.createNewGroup(decrypted.group.members, decrypted.group.id);
|
||||
} else {
|
||||
var fromIndex = existingGroup.indexOf(source);
|
||||
|
||||
if (fromIndex < 0) {
|
||||
//TODO: This could be indication of a race...
|
||||
throw new Error("Sender was not a member of the group they were sending from");
|
||||
}
|
||||
|
||||
switch(decrypted.group.type) {
|
||||
case textsecure.protobuf.GroupContext.Type.UPDATE:
|
||||
return textsecure.storage.groups.updateNumbers(
|
||||
decrypted.group.id, decrypted.group.members
|
||||
).then(function(added) {
|
||||
decrypted.group.added = added;
|
||||
|
||||
if (decrypted.group.avatar === null &&
|
||||
decrypted.group.added.length == 0 &&
|
||||
decrypted.group.name === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
});
|
||||
|
||||
break;
|
||||
case textsecure.protobuf.GroupContext.Type.QUIT:
|
||||
decrypted.body = null;
|
||||
decrypted.attachments = [];
|
||||
return textsecure.storage.groups.removeNumber(decrypted.group.id, source);
|
||||
case textsecure.protobuf.GroupContext.Type.DELIVER:
|
||||
decrypted.group.name = null;
|
||||
decrypted.group.members = [];
|
||||
decrypted.group.avatar = null;
|
||||
|
||||
break;
|
||||
default:
|
||||
throw new Error("Unknown group message type");
|
||||
}
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
for (var i in decrypted.attachments) {
|
||||
promises.push(this.handleAttachment(decrypted.attachments[i]));
|
||||
}
|
||||
return Promise.all(promises).then(function() {
|
||||
return decrypted;
|
||||
});
|
||||
},
|
||||
|
||||
/* Implements EventTarget */
|
||||
dispatchEvent: function(ev) {
|
||||
|
|
@ -283,19 +379,20 @@
|
|||
this.listeners[eventName] = listeners;
|
||||
}
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
textsecure.MessageReceiver = function(url, username, password, signalingKey) {
|
||||
window.textsecure = window.textsecure || {};
|
||||
|
||||
textsecure.MessageReceiver = function(url, username, password, signalingKey) {
|
||||
var messageReceiver = new MessageReceiver(url, username, password, signalingKey);
|
||||
|
||||
this.addEventListener = messageReceiver.addEventListener.bind(messageReceiver);
|
||||
this.removeEventListener = messageReceiver.removeEventListener.bind(messageReceiver);
|
||||
this.getStatus = messageReceiver.getStatus.bind(messageReceiver);
|
||||
this.close = messageReceiver.close.bind(messageReceiver);
|
||||
};
|
||||
messageReceiver.connect();
|
||||
};
|
||||
|
||||
textsecure.MessageReceiver.prototype = {
|
||||
textsecure.MessageReceiver.prototype = {
|
||||
constructor: textsecure.MessageReceiver
|
||||
};
|
||||
};
|
||||
|
||||
}());
|
||||
|
|
|
|||
Loading…
Reference in New Issue