Dispatch all network errors, not just auth errors

Also streamline the onError handler.
pull/749/head
lilia 10 years ago
parent b40a8696b7
commit 6e74ac9e28

@ -125,27 +125,26 @@
return; return;
} }
if (!ev.proto) { if (ev.proto) {
console.log(e); var envelope = ev.proto;
throw e; 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; console.error(e);
var message = initIncomingMessage(envelope.source, envelope.timestamp.toNumber()); throw e;
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;
}
} }
// lazy hack // lazy hack

@ -39500,11 +39500,9 @@ function generateKeys(count, progressCallback) {
if (e.code === 1006) { if (e.code === 1006) {
// possible 403. Make an request to confirm // possible 403. Make an request to confirm
TextSecureServer.getDevices(textsecure.storage.user.getNumber()).catch(function(e) { TextSecureServer.getDevices(textsecure.storage.user.getNumber()).catch(function(e) {
if (e.name === 'HTTPError' && (e.code == 401 || e.code == 403)) { var ev = new Event('error');
var ev = new Event('error'); ev.error = e;
ev.error = e; eventTarget.dispatchEvent(ev);
eventTarget.dispatchEvent(ev);
}
}); });
} }
} }

@ -37,13 +37,9 @@
if (e.code === 1006) { if (e.code === 1006) {
// possible 403. Make an request to confirm // possible 403. Make an request to confirm
TextSecureServer.getDevices(textsecure.storage.user.getNumber()).catch(function(e) { TextSecureServer.getDevices(textsecure.storage.user.getNumber()).catch(function(e) {
if (e.name === 'HTTPError' && (e.code == 401 || e.code == 403)) { var ev = new Event('error');
var ev = new Event('error'); ev.error = e;
ev.error = e; eventTarget.dispatchEvent(ev);
eventTarget.dispatchEvent(ev);
} else {
throw e;
}
}); });
} }
} }

Loading…
Cancel
Save