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

Abstract message error handling

Browse source 
// FREEBIE
This commit is contained in:
lilia 2015-10-01 18:21:20 -07:00
parent e1c9e28b4c
commit 19423bf909
2 changed files with 27 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
js/background.js
View file

@ -198,13 +198,7 @@
if (ev.proto) {
var envelope = ev.proto;
var message = initIncomingMessage(envelope.source, envelope.timestamp.toNumber());
var attributes = {};
if (e.name === 'IncomingIdentityKeyError') {
attributes = { errors : [e] };
} else if (e.message !== 'Bad MAC') {
attributes = { errors : [ _.pick(e, ['name', 'message'])]};
}
message.save(attributes).then(function() {
message.saveErrors(e).then(function() {
ConversationController.findOrCreatePrivateById(message.get('conversationId')).then(function(conversation) {
conversation.save({
active_at: Date.now(),

58
js/models/messages.js
View file

@ -142,49 +142,43 @@
return promise.then(function() {
this.save({sent: true});
}.bind(this)).catch(function(errors) {
if (!(errors instanceof Array)) {
errors = [errors];
}
errors.forEach(function(e) {
console.log(e);
console.log(e.reason, e.stack);
});
this.save({
sent: true,
errors : errors.map(function(e) {
if (e.constructor === Error) {
return _.pick(e, 'name', 'message', 'code', 'number', 'reason');
}
return e;
})
});
this.set({sent: true});
this.saveErrors(errors);
}.bind(this));
},
saveErrors: function(errors) {
if (!(errors instanceof Array)) {
errors = [errors];
}
errors.forEach(function(e) {
console.log(e);
console.log(e.reason, e.stack);
});
return this.save({
errors : errors.map(function(e) {
if (e.constructor === Error) {
return _.pick(e, 'name', 'message', 'code', 'number', 'reason');
}
return e;
})
});
},
resolveConflict: function(number) {
var error = this.getKeyConflict(number);
if (error) {
var promise = new textsecure.ReplayableError(error).replay();
if (this.isIncoming()) {
promise.then(function(dataMessage) {
promise = promise.then(function(dataMessage) {
this.handleDataMessage(dataMessage);
this.save('errors', []);
}.bind(this)).catch(function(e) {
//this.save('errors', [_.pick(e, ['name', 'message'])]);
var errors = this.get('errors').concat(
_.pick(e, ['name', 'message'])
);
this.save('errors', errors);
}.bind(this));
} else {
promise.then(function() {
var errors = _.reject(this.get('errors'), function(e) {
return e.name === 'OutgoingIdentityKeyError' &&
e.number === number;
});
this.save({sent: true, errors: errors});
}.bind(this));
}
promise.then(function() {
this.save('errors', []);
}.bind(this)).catch(function(e) {
this.saveErrors(e);
}.bind(this));
return promise;
}
},