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

Update to real server provisioning API

Browse source
This commit is contained in:
Matt Corallo 2015-01-19 10:23:25 -10:00
parent c112c59ce6
commit 29b2ffc769
5 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

18
js/options.js
View file

@ -137,16 +137,18 @@
$('#setup-qr').html('');
textsecure.protocol.prepareTempWebsocket().then(function(cryptoInfo) {
var qrCode = new QRCode(document.getElementById('setup-qr'));
var socket = textsecure.api.getTempWebsocket();
socket.onmessage = function(message) {
if (message.uuid) {
var socket = textsecure.api.getTempWebsocket();
new WebSocketResource(socket, function(request) {
if (request.path == "/v1/address" && request.verb == "PUT") {
var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
qrCode.makeCode('textsecure-device-init:/' +
'?channel_uuid=' + message.uuid +
'?channel_uuid=' + proto.uuid +
'&channel_server=' + textsecure.api.relay +
'&publicKey=' + btoa(getString(cryptoInfo.publicKey)));
$('img').removeAttr('style');
$('#multi-device .status').text("Use your phone to scan the QR code.")
request.respond(200, 'OK');
} else {
$('#init-setup').hide();
$('#verify1done').text('');
@ -157,7 +159,7 @@
$('#verify').show().addClass('in');
textsecure.registerSecondDevice(cryptoInfo, message.message, function(step) {
textsecure.registerSecondDevice(message.body, cryptoInfo, function(step) {
switch(step) {
case 1:
$('#verify1done').text('done');
@ -179,11 +181,7 @@
}
});
}
};
socket.ondisconnect = function() {
$('#multi-device .status').text("The push server disconnected, please wait while we reconnect...");
};
});
});
});
}