Dispatch all network errors, not just auth errors
Also streamline the onError handler.
This commit is contained in:
@@ -125,11 +125,7 @@
|
||||
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') {
|
||||
@@ -137,17 +133,20 @@
|
||||
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);
|
||||
});
|
||||
} else {
|
||||
console.log(e);
|
||||
throw e;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
console.error(e);
|
||||
throw e;
|
||||
}
|
||||
|
||||
// lazy hack
|
||||
window.receipts = new Backbone.Collection();
|
||||
|
||||
|
@@ -39500,11 +39500,9 @@ function generateKeys(count, progressCallback) {
|
||||
if (e.code === 1006) {
|
||||
// possible 403. Make an request to confirm
|
||||
TextSecureServer.getDevices(textsecure.storage.user.getNumber()).catch(function(e) {
|
||||
if (e.name === 'HTTPError' && (e.code == 401 || e.code == 403)) {
|
||||
var ev = new Event('error');
|
||||
ev.error = e;
|
||||
eventTarget.dispatchEvent(ev);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -37,13 +37,9 @@
|
||||
if (e.code === 1006) {
|
||||
// possible 403. Make an request to confirm
|
||||
TextSecureServer.getDevices(textsecure.storage.user.getNumber()).catch(function(e) {
|
||||
if (e.name === 'HTTPError' && (e.code == 401 || e.code == 403)) {
|
||||
var ev = new Event('error');
|
||||
ev.error = e;
|
||||
eventTarget.dispatchEvent(ev);
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user