thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Define UnregisteredUserError class

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-05-25 15:04:03 -07:00
parent 81dfdd959f
commit 89d3b772d5
3 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
js/libtextsecure.js
View file

@ -102,7 +102,17 @@
MessageError.prototype = new ReplayableError(); MessageError.prototype = new ReplayableError();
MessageError.prototype.constructor = MessageError; MessageError.prototype.constructor = MessageError;
function UnregisteredUserError(number, httpError) {
this.name = 'UnregisteredUserError';
this.number = number;
this.code = httpError.code;
this.message = httpError.message;
this.stack = httpError.stack;
}
UnregisteredUserError.prototype = new Error();
UnregisteredUserError.prototype.constructor = UnregisteredUserError;
window.textsecure.UnregisteredUserError = UnregisteredUserError;
window.textsecure.SendMessageNetworkError = SendMessageNetworkError; window.textsecure.SendMessageNetworkError = SendMessageNetworkError;
window.textsecure.IncomingIdentityKeyError = IncomingIdentityKeyError; window.textsecure.IncomingIdentityKeyError = IncomingIdentityKeyError;
window.textsecure.OutgoingIdentityKeyError = OutgoingIdentityKeyError; window.textsecure.OutgoingIdentityKeyError = OutgoingIdentityKeyError;
@ -38570,9 +38580,13 @@ OutgoingMessage.prototype = {
transmitMessage: function(number, jsonData, timestamp) { transmitMessage: function(number, jsonData, timestamp) {
return this.server.sendMessages(number, jsonData, timestamp).catch(function(e) { return this.server.sendMessages(number, jsonData, timestamp).catch(function(e) {
if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410 && e.code !== 404)) { if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410)) {
// 409 and 410 should bubble and be handled by doSendMessage // 409 and 410 should bubble and be handled by doSendMessage
// 404 should throw UnregisteredUserError
// all other network errors can be retried later. // all other network errors can be retried later.
if (e.code === 404) {
throw new textsecure.UnregisteredUserError(number, e);
}
throw new textsecure.SendMessageNetworkError(number, jsonData, e, timestamp); throw new textsecure.SendMessageNetworkError(number, jsonData, e, timestamp);
} }
throw e; throw e;

10
libtextsecure/errors.js
View file

@ -101,7 +101,17 @@
MessageError.prototype = new ReplayableError(); MessageError.prototype = new ReplayableError();
MessageError.prototype.constructor = MessageError; MessageError.prototype.constructor = MessageError;
function UnregisteredUserError(number, httpError) {
this.name = 'UnregisteredUserError';
this.number = number;
this.code = httpError.code;
this.message = httpError.message;
this.stack = httpError.stack;
}
UnregisteredUserError.prototype = new Error();
UnregisteredUserError.prototype.constructor = UnregisteredUserError;
window.textsecure.UnregisteredUserError = UnregisteredUserError;
window.textsecure.SendMessageNetworkError = SendMessageNetworkError; window.textsecure.SendMessageNetworkError = SendMessageNetworkError;
window.textsecure.IncomingIdentityKeyError = IncomingIdentityKeyError; window.textsecure.IncomingIdentityKeyError = IncomingIdentityKeyError;
window.textsecure.OutgoingIdentityKeyError = OutgoingIdentityKeyError; window.textsecure.OutgoingIdentityKeyError = OutgoingIdentityKeyError;

6
libtextsecure/outgoing_message.js
View file

@ -79,9 +79,13 @@ OutgoingMessage.prototype = {
transmitMessage: function(number, jsonData, timestamp) { transmitMessage: function(number, jsonData, timestamp) {
return this.server.sendMessages(number, jsonData, timestamp).catch(function(e) { return this.server.sendMessages(number, jsonData, timestamp).catch(function(e) {
if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410 && e.code !== 404)) { if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410)) {
// 409 and 410 should bubble and be handled by doSendMessage // 409 and 410 should bubble and be handled by doSendMessage
// 404 should throw UnregisteredUserError
// all other network errors can be retried later. // all other network errors can be retried later.
if (e.code === 404) {
throw new textsecure.UnregisteredUserError(number, e);
}
throw new textsecure.SendMessageNetworkError(number, jsonData, e, timestamp); throw new textsecure.SendMessageNetworkError(number, jsonData, e, timestamp);
} }
throw e; throw e;