From 05a5b7e76c76fa3cd622b9196658f2189ab900ac Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 12 Feb 2015 15:09:30 -0800
Subject: [PATCH] Fixes #152

Android client was crashing any time the base64-encoded public key
included a '+' due to lack of url encoding.
---
 js/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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