From 7af42a27c5c6061c1017ab2133b8b7745d2a1450 Mon Sep 17 00:00:00 2001 From: lilia Date: Fri, 10 Apr 2015 11:47:06 -0700 Subject: [PATCH] Fix registerKeys using array indices for key ids preKeys is an array whose indices may or may not be keyId-based. Since we have an inline keyId property, use that instead. --- js/libtextsecure.js | 2 +- libtextsecure/api.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 2ede60c5e..674478588 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -39239,7 +39239,7 @@ window.textsecure.api = function () { keys.preKeys = []; var j = 0; for (var i in genKeys.preKeys) - keys.preKeys[j++] = {keyId: i, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))}; + keys.preKeys[j++] = {keyId: genKeys.preKeys[i].keyId, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))}; //TODO: This is just to make the server happy (v2 clients should choke on publicKey), // it needs removed before release diff --git a/libtextsecure/api.js b/libtextsecure/api.js index b44a2a42b..18ff212f9 100644 --- a/libtextsecure/api.js +++ b/libtextsecure/api.js @@ -194,7 +194,7 @@ window.textsecure.api = function () { keys.preKeys = []; var j = 0; for (var i in genKeys.preKeys) - keys.preKeys[j++] = {keyId: i, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))}; + keys.preKeys[j++] = {keyId: genKeys.preKeys[i].keyId, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))}; //TODO: This is just to make the server happy (v2 clients should choke on publicKey), // it needs removed before release