diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 125285de8..cac599ffe 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -37110,7 +37110,7 @@ OutgoingMessage.prototype = { numberCompleted: function() { this.numbersCompleted++; if (this.numbersCompleted >= this.numbers.length) { - this.callback({success: this.successfulNumbers, failure: this.errors}); + this.callback({successfulNumbers: this.successfulNumbers, errors: this.errors}); } }, registerError: function(number, reason, error) { @@ -37326,10 +37326,10 @@ MessageSender.prototype = { sendIndividualProto: function(number, proto, timestamp) { return new Promise(function(resolve, reject) { this.sendMessageProto(timestamp, [number], proto, function(res) { - if (res.failure.length > 0) - reject(res.failure); + if (res.errors.length > 0) + reject(res); else - resolve(); + resolve(res); }); }.bind(this)); }, @@ -37393,10 +37393,10 @@ MessageSender.prototype = { return new Promise(function(resolve, reject) { this.sendMessageProto(timestamp, numbers, proto, function(res) { - if (res.failure.length > 0) - reject(res.failure); + if (res.errors.length > 0) + reject(res); else - resolve(); + resolve(res); }); }.bind(this)).then(this.sendSyncMessage.bind(this, proto, timestamp)); }, diff --git a/js/models/messages.js b/js/models/messages.js index a65a641db..5f4cb12ae 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -146,7 +146,7 @@ }.bind(this)).catch(function(errors) { this.trigger('done'); this.set({sent: true}); - this.saveErrors(errors); + this.saveErrors(result.errors); }.bind(this)); }, diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js index c5596ba0c..51230af0b 100644 --- a/libtextsecure/outgoing_message.js +++ b/libtextsecure/outgoing_message.js @@ -19,7 +19,7 @@ OutgoingMessage.prototype = { numberCompleted: function() { this.numbersCompleted++; if (this.numbersCompleted >= this.numbers.length) { - this.callback({success: this.successfulNumbers, failure: this.errors}); + this.callback({successfulNumbers: this.successfulNumbers, errors: this.errors}); } }, registerError: function(number, reason, error) { diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index 2b96e4ead..68ea349a7 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -58,10 +58,10 @@ MessageSender.prototype = { sendIndividualProto: function(number, proto, timestamp) { return new Promise(function(resolve, reject) { this.sendMessageProto(timestamp, [number], proto, function(res) { - if (res.failure.length > 0) - reject(res.failure); + if (res.errors.length > 0) + reject(res); else - resolve(); + resolve(res); }); }.bind(this)); }, @@ -125,10 +125,10 @@ MessageSender.prototype = { return new Promise(function(resolve, reject) { this.sendMessageProto(timestamp, numbers, proto, function(res) { - if (res.failure.length > 0) - reject(res.failure); + if (res.errors.length > 0) + reject(res); else - resolve(); + resolve(res); }); }.bind(this)).then(this.sendSyncMessage.bind(this, proto, timestamp)); },