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

Fixes #152

Browse source 
Android client was crashing any time the base64-encoded public key
included a '+' due to lack of url encoding.
This commit is contained in:
lilia 2015-02-12 15:09:30 -08:00
parent a104ee9ca6
commit 05a5b7e76c
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/options.js
View file

@ -144,7 +144,7 @@
var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body); var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
qrCode.makeCode('tsdevice:/' + qrCode.makeCode('tsdevice:/' +
'?uuid=' + proto.uuid + '?uuid=' + proto.uuid +
'&pub_key=' + btoa(getString(cryptoInfo.pubKey))); '&pub_key=' + encodeURIComponent(btoa(getString(cryptoInfo.pubKey))));
$('img').removeAttr('style'); $('img').removeAttr('style');
$('#multi-device .status').text("Use your phone to scan the QR code.") $('#multi-device .status').text("Use your phone to scan the QR code.")
request.respond(200, 'OK'); request.respond(200, 'OK');