From 104c48b6eb3d6c2a092fae4d50ddd54d0130609b Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Tue, 5 Nov 2013 14:10:33 -0300
Subject: Move string encoding to srpregister.

---
 src/leap/bitmask/crypto/srpregister.py | 3 ++-
 src/leap/bitmask/gui/wizard.py         | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/leap/bitmask')

diff --git a/src/leap/bitmask/crypto/srpregister.py b/src/leap/bitmask/crypto/srpregister.py
index 5c0a8efc..61f1899a 100644
--- a/src/leap/bitmask/crypto/srpregister.py
+++ b/src/leap/bitmask/crypto/srpregister.py
@@ -108,7 +108,8 @@ class SRPRegister(QtCore.QObject):
         :rparam: (ok, request)
         """
 
-        username = username.lower()
+        username = username.lower().encode('utf-8')
+        password = password.encode('utf-8')
 
         salt, verifier = self._srp.create_salted_verification_key(
             username,
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 6ba65410..e9c1d86c 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -226,9 +226,7 @@ class Wizard(QtGui.QWizard):
                 self._registration_finished)
 
             threads.deferToThread(
-                partial(register.register_user,
-                        username.encode("utf8"),
-                        password.encode("utf8")))
+                partial(register.register_user, username, password))
 
             self._username = username
             self._password = password
-- 
cgit v1.2.3


From 5ae44d80876aa9c1e60280fbf437ee687d9bc3c8 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Tue, 5 Nov 2013 14:59:30 -0300
Subject: Handle Timeout errors during register.

Also catch all request exceptions to avoid failures.

[Closes #4358]
---
 src/leap/bitmask/crypto/srpregister.py | 3 +--
 src/leap/bitmask/gui/wizard.py         | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/leap/bitmask')

diff --git a/src/leap/bitmask/crypto/srpregister.py b/src/leap/bitmask/crypto/srpregister.py
index 61f1899a..e110df68 100644
--- a/src/leap/bitmask/crypto/srpregister.py
+++ b/src/leap/bitmask/crypto/srpregister.py
@@ -141,8 +141,7 @@ class SRPRegister(QtCore.QObject):
                                      verify=self._provider_config.
                                      get_ca_cert_path())
 
-        except (requests.exceptions.SSLError,
-                requests.exceptions.ConnectionError) as exc:
+        except requests.exceptions.RequestExceptions as exc:
             logger.error(exc.message)
             ok = False
         else:
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index e9c1d86c..8de5802e 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -280,7 +280,8 @@ class Wizard(QtGui.QWizard):
             old_username = self._username
             self._username = None
             self._password = None
-            error_msg = self.tr("Unknown error")
+            error_msg = self.tr("Something has gone wrong. "
+                                "Please try again.")
             try:
                 content, _ = get_content(req)
                 json_content = json.loads(content)
-- 
cgit v1.2.3