Normalize send-path error handling
Receive and handle an array of errors in both the group and individual cases.
This commit is contained in:
parent
80993753de
commit
8ed73d0ce5
2 changed files with 12 additions and 6 deletions
|
@ -66,14 +66,20 @@
|
|||
else {
|
||||
sendFunc = textsecure.messaging.sendMessageToGroup;
|
||||
}
|
||||
sendFunc(this.get('id'), body, attachments, now).catch(function(e) {
|
||||
if (e.name === 'OutgoingIdentityKeyError') {
|
||||
e.args.push(message.id);
|
||||
message.save({ errors : [e] }).then(function() {
|
||||
sendFunc(this.get('id'), body, attachments, now).catch(function(errors) {
|
||||
var keyErrors = [];
|
||||
_.each(errors, function(e) {
|
||||
if (e.error.name === 'OutgoingIdentityKeyError') {
|
||||
e.error.args.push(message.id);
|
||||
keyErrors.push(e.error);
|
||||
}
|
||||
});
|
||||
if (keyErrors.length) {
|
||||
message.save({ errors : keyErrors }).then(function() {
|
||||
extension.trigger('message', message); // notify frontend listeners
|
||||
});
|
||||
} else {
|
||||
throw e;
|
||||
throw errors;
|
||||
}
|
||||
});
|
||||
},
|
||||
|
|
|
@ -238,7 +238,7 @@ window.textsecure.messaging = function() {
|
|||
return new Promise(function(resolve, reject) {
|
||||
sendMessageProto(timestamp, [number], proto, function(res) {
|
||||
if (res.failure.length > 0)
|
||||
reject(res.failure[0].error);
|
||||
reject(res.failure);
|
||||
else
|
||||
resolve();
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue