Throw UnregisteredUserErrors in getKeysForNumber()

signalapp · Feb 9, 2017 · d2ddfc7 · d2ddfc7
1 parent e8de2f0
commit d2ddfc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/js/libtextsecure.js b/js/libtextsecure.js
@@ -38640,8 +38640,9 @@ OutgoingMessage.prototype = {
             updateDevices.forEach(function(device) {
                 promise = promise.then(function() {
                     return this.server.getKeysForNumber(number, device).then(handleResult).catch(function(e) {
-                        if (e.name === 'HTTPError' && e.code === 404 && device !== 1) {
-                            return this.removeDeviceIdsForNumber(number, [device]);
+                        if (e.name === 'HTTPError' && e.code === 404) {
+                            if (device !== 1) return this.removeDeviceIdsForNumber(number, [device]);
+                            else throw new textsecure.UnregisteredUserError(number, e);
                         } else {
                             throw e;
                         }

diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js
@@ -70,8 +70,9 @@ OutgoingMessage.prototype = {
             updateDevices.forEach(function(device) {
                 promise = promise.then(function() {
                     return this.server.getKeysForNumber(number, device).then(handleResult).catch(function(e) {
-                        if (e.name === 'HTTPError' && e.code === 404 && device !== 1) {
-                            return this.removeDeviceIdsForNumber(number, [device]);
+                        if (e.name === 'HTTPError' && e.code === 404) {
+                            if (device !== 1) return this.removeDeviceIdsForNumber(number, [device]);
+                            else throw new textsecure.UnregisteredUserError(number, e);
                         } else {
                             throw e;
                         }