mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix up a few things so registration works

Browse source
This commit is contained in:
Matt Corallo 2014-03-23 13:19:53 -04:00
parent 832daf54db
commit 000a5e1440
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/api.js
View file

@ -99,6 +99,11 @@ var API = new function() {
}; };
this.registerKeys = function(keys, success_callback, error_callback) { this.registerKeys = function(keys, success_callback, error_callback) {
//TODO: Do this conversion somewhere else?
var identityKey = btoa(getString(keys.keys[0].identityKey));
for (var i = 0; i < keys.keys.length; i++)
keys.keys[i] = {keyId: i, publicKey: btoa(getString(keys.keys[i].publicKey)), identityKey: identityKey};
keys.lastResortKey = {keyId: keys.lastResortKey.keyId, publicKey: btoa(getString(keys.lastResortKey.publicKey)), identityKey: identityKey};
this.doAjax({ this.doAjax({
call : 'keys', call : 'keys',
httpType : 'PUT', httpType : 'PUT',

2
js/helpers.js
View file

@ -855,7 +855,7 @@ var crypto_tests = {};
if (identityKey === undefined) if (identityKey === undefined)
crypto_storage.getNewPubKeySTORINGPrivKey("identityKey", function(pubKey) { identityKeyCalculated(pubKey); }); crypto_storage.getNewPubKeySTORINGPrivKey("identityKey", function(pubKey) { identityKeyCalculated(pubKey); });
else else
identityKeyCalculated(pubKey); identityKeyCalculated(identityKey);
} }
}( window.crypto = window.crypto || {}, jQuery )); }( window.crypto = window.crypto || {}, jQuery ));

2
js/options.js
View file

@ -58,7 +58,7 @@ $('#init-go').click(function() {
$('#verify4done').html(''); $('#verify4done').html('');
$('#verify').show(); $('#verify').show();
API.confirmCode(code, number, password, signaling_key, single_device, API.confirmCode($('#code').val(), number, password, signaling_key, single_device,
function(response) { function(response) {
if (single_device) if (single_device)
response = 1; response = 1;

1
options.html
View file

@ -41,7 +41,6 @@
<script type="text/javascript" src="js-deps/ByteBuffer.min.js"></script> <script type="text/javascript" src="js-deps/ByteBuffer.min.js"></script>
<script type="text/javascript" src="js-deps/ProtoBuf.min.js"></script> <script type="text/javascript" src="js-deps/ProtoBuf.min.js"></script>
<script type="text/javascript" src="js/api.js"></script> <script type="text/javascript" src="js/api.js"></script>
<script type="text/javascript" src="js/fake_api.js"></script>
<script type="text/javascript" src="js/helpers.js"></script> <script type="text/javascript" src="js/helpers.js"></script>
<script type="text/javascript" src="js/options.js"></script> <script type="text/javascript" src="js/options.js"></script>
</body> </body>