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

Don't allow retry on unregistered user errors

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-05-24 11:36:04 -07:00
parent 292260d973
commit 81dfdd959f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/libtextsecure.js
View file

@ -38514,7 +38514,7 @@ OutgoingMessage.prototype = {
} }
}, },
registerError: function(number, reason, error) { registerError: function(number, reason, error) {
if (!error || error.name === 'HTTPError') { if (!error || error.name === 'HTTPError' && error.code !== 404) {
error = new textsecure.OutgoingMessageError(number, this.message.toArrayBuffer(), this.timestamp, error); error = new textsecure.OutgoingMessageError(number, this.message.toArrayBuffer(), this.timestamp, error);
} }
@ -38570,7 +38570,7 @@ 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)) { if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410 && e.code !== 404)) {
// 409 and 410 should bubble and be handled by doSendMessage // 409 and 410 should bubble and be handled by doSendMessage
// all other network errors can be retried later. // all other network errors can be retried later.
throw new textsecure.SendMessageNetworkError(number, jsonData, e, timestamp); throw new textsecure.SendMessageNetworkError(number, jsonData, e, timestamp);

4
libtextsecure/outgoing_message.js
View file

@ -23,7 +23,7 @@ OutgoingMessage.prototype = {
} }
}, },
registerError: function(number, reason, error) { registerError: function(number, reason, error) {
if (!error || error.name === 'HTTPError') { if (!error || error.name === 'HTTPError' && error.code !== 404) {
error = new textsecure.OutgoingMessageError(number, this.message.toArrayBuffer(), this.timestamp, error); error = new textsecure.OutgoingMessageError(number, this.message.toArrayBuffer(), this.timestamp, error);
} }
@ -79,7 +79,7 @@ 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)) { if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410 && e.code !== 404)) {
// 409 and 410 should bubble and be handled by doSendMessage // 409 and 410 should bubble and be handled by doSendMessage
// all other network errors can be retried later. // all other network errors can be retried later.
throw new textsecure.SendMessageNetworkError(number, jsonData, e, timestamp); throw new textsecure.SendMessageNetworkError(number, jsonData, e, timestamp);