summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/backend/components.py
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-02-14 17:52:27 -0600
committerRuben Pollan <meskio@sindominio.net>2015-02-18 11:19:03 -0600
commit82652e174b4f38a29ce488421eb6c0067d0c657f (patch)
tree59c012a118a61611e4486759645cebc1715b7a0e /src/leap/bitmask/backend/components.py
parent62a64e7abff3e988f7cd55f04121310a40017784 (diff)
Do the soledad sync the twisted way
This closes: #6658 and #6691
Diffstat (limited to 'src/leap/bitmask/backend/components.py')
-rw-r--r--src/leap/bitmask/backend/components.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index a843147e..1efcda6c 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -779,10 +779,8 @@ class Soledad(object):
"""
provider_config = ProviderConfig.get_provider_config(domain)
if provider_config is not None:
- # XXX FIXME --- remove defer-to-thread or at least put it in a
- # separate threadpool.
- self._soledad_defer = threads.deferToThread(
- self._soledad_bootstrapper.run_soledad_setup_checks,
+ sb = self._soledad_bootstrapper
+ self._soledad_defer = sb.run_soledad_setup_checks(
provider_config, username, password,
download_if_needed=True)
self._soledad_defer.addCallback(self._set_proxies_cb)