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

Dispatch all network errors, not just auth errors

Browse source 
Also streamline the onError handler.
This commit is contained in:
lilia 2015-07-10 12:24:12 -07:00
parent b40a8696b7
commit 6e74ac9e28
3 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

37
js/background.js
View file

@ -125,27 +125,26 @@
return;
}
if (!ev.proto) {
console.log(e);
throw e;
if (ev.proto) {
var envelope = ev.proto;
var message = initIncomingMessage(envelope.source, envelope.timestamp.toNumber());
if (e.name === 'IncomingIdentityKeyError') {
message.save({ errors : [e] }).then(function() {
extension.trigger('updateInbox');
notifyConversation(message);
});
return;
} else if (e.message !== 'Bad MAC') {
message.save({ errors : [ _.pick(e, ['name', 'message'])]}).then(function() {
extension.trigger('updateInbox');
notifyConversation(message);
});
return;
}
}
var envelope = ev.proto;
var message = initIncomingMessage(envelope.source, envelope.timestamp.toNumber());
if (e.name === 'IncomingIdentityKeyError') {
message.save({ errors : [e] }).then(function() {
extension.trigger('updateInbox');
notifyConversation(message);
});
} else if (e.message !== 'Bad MAC') {
message.save({ errors : [ _.pick(e, ['name', 'message'])]}).then(function() {
extension.trigger('updateInbox');
notifyConversation(message);
});
} else {
console.log(e);
throw e;
}
console.error(e);
throw e;
}
// lazy hack