From 4f1ce4c493f6ecda66abae928e3bea1a256538b2 Mon Sep 17 00:00:00 2001 From: lilia Date: Wed, 5 Aug 2015 16:06:28 -0700 Subject: [PATCH] Assume unknown recipients are single-device Start by requesting keys for only the master device, then handle 410 as needed. Single-device users are the more common case and this strategy lets us avoid requesting/expending one of our own device keys when establishing a session with sibling devices. // 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 5b76e4cf2..976d2fd73 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -40007,7 +40007,7 @@ window.textsecure.messaging = function() { })).then(function() { return textsecure.storage.devices.getDeviceObjectsForNumber(number).then(function(devicesForNumber) { if (devicesForNumber.length == 0) { - getKeysForNumber(number) + getKeysForNumber(number, [1]) .then(reloadDevicesAndSend(number, true)) .catch(function(error) { registerError(number, "Failed to retreive new device keys for number " + number, error); diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index 0b67e121c..18088683f 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -244,7 +244,7 @@ window.textsecure.messaging = function() { })).then(function() { return textsecure.storage.devices.getDeviceObjectsForNumber(number).then(function(devicesForNumber) { if (devicesForNumber.length == 0) { - getKeysForNumber(number) + getKeysForNumber(number, [1]) .then(reloadDevicesAndSend(number, true)) .catch(function(error) { registerError(number, "Failed to retreive new device keys for number " + number, error);