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

Remove getRegistrationId and encryptMessageFor from protocol_wrapper

Browse source 
We can now use protocol classes like SessionCipher directly because it
supports per-device read/write serialization internally.

// FREEBIE
This commit is contained in:
lilia 2016-05-01 14:15:51 -07:00
parent 284cf5be3a
commit 843036f0ce
4 changed files with 18 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libtextsecure/outgoing_message.js
View file

@ -130,17 +130,21 @@ OutgoingMessage.prototype = {
encryptToDevices: function(deviceObjectList) {
var plaintext = this.message.toArrayBuffer();
return Promise.all(deviceObjectList.map(function(device) {
return textsecure.protocol_wrapper.encryptMessageFor(device, plaintext).then(function(encryptedMsg) {
return this.toJSON(device, encryptedMsg);
var address = libsignal.SignalProtocolAddress.fromString(device.encodedNumber);
var sessionCipher = new libsignal.SessionCipher(textsecure.storage.protocol, address);
return sessionCipher.encrypt(plaintext).then(function(encryptedMsg) {
return sessionCipher.getRemoteRegistrationId().then(function(registrationId) {
return this.toJSON(device, encryptedMsg, registrationId);
}.bind(this));
}.bind(this));
}.bind(this)));
},
toJSON: function(device, encryptedMsg) {
toJSON: function(device, encryptedMsg, registrationId) {
var json = {
type: encryptedMsg.type,
destinationDeviceId: textsecure.utils.unencodeNumber(device.encodedNumber)[1],
destinationRegistrationId: device.registrationId
destinationRegistrationId: registrationId
};
if (device.relay !== undefined) {