Refactor sendMessageToDevices
Split into separate encrypt and transmit functions. Let the encryption function also handle all wire formatting (ie, jsonification and base64 encoding), which simplifes TextSecureServer.sendMessages, removes a TODO, and lets us save fewer params to make network errors replayable. // FREEBIE
This commit is contained in:
parent
e9bc39bc56
commit
816a206892
4 changed files with 52 additions and 52 deletions
|
@ -230,15 +230,7 @@ var TextSecureServer = (function() {
|
|||
return res;
|
||||
});
|
||||
},
|
||||
sendMessages: function(destination, messageArray, legacy) {
|
||||
//TODO: Do this conversion somewhere else?
|
||||
for (var i = 0; i < messageArray.length; i++) {
|
||||
messageArray[i].content = btoa(messageArray[i].content);
|
||||
if (legacy) {
|
||||
messageArray[i].body = messageArray[i].content;
|
||||
delete messageArray[i].content;
|
||||
}
|
||||
}
|
||||
sendMessages: function(destination, messageArray) {
|
||||
var jsonData = { messages: messageArray };
|
||||
jsonData.timestamp = messageArray[0].timestamp;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue