mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

OutgoingMessage: A few code style tweaks to make things readable

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-06-22 17:39:31 -07:00
parent 116e4d2eeb
commit 551aa24e9a
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
js/libtextsecure.js
View file

@ -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") {

12
libtextsecure/outgoing_message.js
View file

@ -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") {