From 551aa24e9abbb9d419c982bac3c111e0c34203ba Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 22 Jun 2017 17:39:31 -0700 Subject: [PATCH] OutgoingMessage: A few code style tweaks to make things readable FREEBIE --- js/libtextsecure.js | 12 +++++++----- libtextsecure/outgoing_message.js | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 0735aa205..b03e201eb 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -38819,8 +38819,11 @@ OutgoingMessage.prototype = { promise = promise.then(function() { return this.server.getKeysForNumber(number, device).then(handleResult).catch(function(e) { if (e.name === 'HTTPError' && e.code === 404) { - if (device !== 1) return this.removeDeviceIdsForNumber(number, [device]); - else throw new textsecure.UnregisteredUserError(number, e); + if (device !== 1) { + return this.removeDeviceIdsForNumber(number, [device]); + } else { + throw new textsecure.UnregisteredUserError(number, e); + } } else { throw e; } @@ -38908,9 +38911,8 @@ OutgoingMessage.prototype = { return p.then(function() { var resetDevices = ((error.code == 410) ? error.response.staleDevices : error.response.missingDevices); return this.getKeysForNumber(number, resetDevices) - .then(this.reloadDevicesAndSend(number, (error.code == 409))) - .catch(function(error) { - this.registerError(number, "Failed to reload device keys", error); + .then(function() { + return this.reloadDevicesAndSend(number, error.code == 409); }.bind(this)); }.bind(this)); } else if (error.message === "Identity key changed") { diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js index b688572cc..b0f9849a9 100644 --- a/libtextsecure/outgoing_message.js +++ b/libtextsecure/outgoing_message.js @@ -77,8 +77,11 @@ OutgoingMessage.prototype = { promise = promise.then(function() { return this.server.getKeysForNumber(number, device).then(handleResult).catch(function(e) { if (e.name === 'HTTPError' && e.code === 404) { - if (device !== 1) return this.removeDeviceIdsForNumber(number, [device]); - else throw new textsecure.UnregisteredUserError(number, e); + if (device !== 1) { + return this.removeDeviceIdsForNumber(number, [device]); + } else { + throw new textsecure.UnregisteredUserError(number, e); + } } else { throw e; } @@ -166,9 +169,8 @@ OutgoingMessage.prototype = { return p.then(function() { var resetDevices = ((error.code == 410) ? error.response.staleDevices : error.response.missingDevices); return this.getKeysForNumber(number, resetDevices) - .then(this.reloadDevicesAndSend(number, (error.code == 409))) - .catch(function(error) { - this.registerError(number, "Failed to reload device keys", error); + .then(function() { + return this.reloadDevicesAndSend(number, error.code == 409); }.bind(this)); }.bind(this)); } else if (error.message === "Identity key changed") {