From 1879e73c766be0b5165ab5777ed56e5ddb95c3f2 Mon Sep 17 00:00:00 2001 From: lilia Date: Mon, 28 Sep 2015 14:10:50 -0700 Subject: [PATCH] Allow one more retry if we get a 409 Handle cases where we get a 409 (missing/extra devices), handle it, then get a 410 (stale devices by registration id). // FREEBIE --- js/libtextsecure.js | 2 +- libtextsecure/sendmessage.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 804eb6be1a..10561bb9db 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -39831,7 +39831,7 @@ window.textsecure.messaging = function() { p.then(function() { var resetDevices = ((error.code == 410) ? error.response.staleDevices : error.response.missingDevices); getKeysForNumber(number, resetDevices) - .then(reloadDevicesAndSend(number, false)) + .then(reloadDevicesAndSend(number, (error.code == 409))) .catch(function(error) { registerError(number, "Failed to reload device keys", error); }); diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index 4ec55d1f92..6c643b0820 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -152,7 +152,7 @@ window.textsecure.messaging = function() { p.then(function() { var resetDevices = ((error.code == 410) ? error.response.staleDevices : error.response.missingDevices); getKeysForNumber(number, resetDevices) - .then(reloadDevicesAndSend(number, false)) + .then(reloadDevicesAndSend(number, (error.code == 409))) .catch(function(error) { registerError(number, "Failed to reload device keys", error); });