OutgoingMessage: A few code style tweaks to make things readable
FREEBIE
This commit is contained in:
parent
116e4d2eeb
commit
551aa24e9a
2 changed files with 14 additions and 10 deletions
|
@ -38819,8 +38819,11 @@ OutgoingMessage.prototype = {
|
||||||
promise = promise.then(function() {
|
promise = promise.then(function() {
|
||||||
return this.server.getKeysForNumber(number, device).then(handleResult).catch(function(e) {
|
return this.server.getKeysForNumber(number, device).then(handleResult).catch(function(e) {
|
||||||
if (e.name === 'HTTPError' && e.code === 404) {
|
if (e.name === 'HTTPError' && e.code === 404) {
|
||||||
if (device !== 1) return this.removeDeviceIdsForNumber(number, [device]);
|
if (device !== 1) {
|
||||||
else throw new textsecure.UnregisteredUserError(number, e);
|
return this.removeDeviceIdsForNumber(number, [device]);
|
||||||
|
} else {
|
||||||
|
throw new textsecure.UnregisteredUserError(number, e);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
@ -38908,9 +38911,8 @@ OutgoingMessage.prototype = {
|
||||||
return p.then(function() {
|
return p.then(function() {
|
||||||
var resetDevices = ((error.code == 410) ? error.response.staleDevices : error.response.missingDevices);
|
var resetDevices = ((error.code == 410) ? error.response.staleDevices : error.response.missingDevices);
|
||||||
return this.getKeysForNumber(number, resetDevices)
|
return this.getKeysForNumber(number, resetDevices)
|
||||||
.then(this.reloadDevicesAndSend(number, (error.code == 409)))
|
.then(function() {
|
||||||
.catch(function(error) {
|
return this.reloadDevicesAndSend(number, error.code == 409);
|
||||||
this.registerError(number, "Failed to reload device keys", error);
|
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
} else if (error.message === "Identity key changed") {
|
} else if (error.message === "Identity key changed") {
|
||||||
|
|
|
@ -77,8 +77,11 @@ OutgoingMessage.prototype = {
|
||||||
promise = promise.then(function() {
|
promise = promise.then(function() {
|
||||||
return this.server.getKeysForNumber(number, device).then(handleResult).catch(function(e) {
|
return this.server.getKeysForNumber(number, device).then(handleResult).catch(function(e) {
|
||||||
if (e.name === 'HTTPError' && e.code === 404) {
|
if (e.name === 'HTTPError' && e.code === 404) {
|
||||||
if (device !== 1) return this.removeDeviceIdsForNumber(number, [device]);
|
if (device !== 1) {
|
||||||
else throw new textsecure.UnregisteredUserError(number, e);
|
return this.removeDeviceIdsForNumber(number, [device]);
|
||||||
|
} else {
|
||||||
|
throw new textsecure.UnregisteredUserError(number, e);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
@ -166,9 +169,8 @@ OutgoingMessage.prototype = {
|
||||||
return p.then(function() {
|
return p.then(function() {
|
||||||
var resetDevices = ((error.code == 410) ? error.response.staleDevices : error.response.missingDevices);
|
var resetDevices = ((error.code == 410) ? error.response.staleDevices : error.response.missingDevices);
|
||||||
return this.getKeysForNumber(number, resetDevices)
|
return this.getKeysForNumber(number, resetDevices)
|
||||||
.then(this.reloadDevicesAndSend(number, (error.code == 409)))
|
.then(function() {
|
||||||
.catch(function(error) {
|
return this.reloadDevicesAndSend(number, error.code == 409);
|
||||||
this.registerError(number, "Failed to reload device keys", error);
|
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
} else if (error.message === "Identity key changed") {
|
} else if (error.message === "Identity key changed") {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue