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

Few typos blocking registration

Browse source
This commit is contained in:
Matt Corallo 2014-05-28 04:03:23 +02:00
parent eb80a10ed1
commit 5cea7b6857
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/api.js
View file

@ -112,14 +112,14 @@ window.textsecure.api = function() {
}; };
self.requestVerificationCode = function(number) { self.requestVerificationCode = function(number) {
doAjax({ return doAjax({
call : 'accounts', call : 'accounts',
httpType : 'GET', httpType : 'GET',
urlParameters : '/sms/code/' + number, urlParameters : '/sms/code/' + number,
}); });
}; };
self.confirmCode = function(code, number, password, self.confirmCode = function(number, code, password,
signaling_key, registrationId, single_device) { signaling_key, registrationId, single_device) {
var call = single_device ? 'accounts' : 'devices'; var call = single_device ? 'accounts' : 'devices';
var urlPrefix = single_device ? '/code/' : '/'; var urlPrefix = single_device ? '/code/' : '/';
@ -137,23 +137,17 @@ window.textsecure.api = function() {
}); });
}; };
self.registerKeys = function(keys, success_callback, error_callback) { self.registerKeys = function(keys) {
//TODO: Do this conversion somewhere else? //TODO: Do this conversion somewhere else?
var identityKey = btoa(getString(keys.keys[0].identityKey)); var identityKey = btoa(getString(keys.keys[0].identityKey));
for (var i = 0; i < keys.keys.length; i++) for (var i = 0; i < keys.keys.length; i++)
keys.keys[i] = {keyId: i, publicKey: btoa(getString(keys.keys[i].publicKey)), identityKey: identityKey}; 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}; keys.lastResortKey = {keyId: keys.lastResortKey.keyId, publicKey: btoa(getString(keys.lastResortKey.publicKey)), identityKey: identityKey};
doAjax({ return doAjax({
call : 'keys', call : 'keys',
httpType : 'PUT', httpType : 'PUT',
do_auth : true, do_auth : true,
jsonData : keys, jsonData : keys,
}).then(function(response) {
if (success_callback !== undefined)
success_callback(response);
}).catch(function(code) {
if (error_callback !== undefined)
error_callback(code);
}); });
}; };

2
js/options.js
View file

@ -83,7 +83,7 @@ $('#init-go').click(function() {
$('#verify4done').html(''); $('#verify4done').html('');
$('#verify').show(); $('#verify').show();
textsecure.register($('#code').val(), number, single_device, function(step) { textsecure.register(number, $('#code').val(), single_device, function(step) {
switch(step) { switch(step) {
case 1: case 1:
$('#verify1done').html('done'); $('#verify1done').html('done');