From a759db8bc3c3f9b826f3332da11f090e5c758ee5 Mon Sep 17 00:00:00 2001
From: Folker Bernitt <fbernitt@thoughtworks.com>
Date: Mon, 20 Jul 2015 11:08:11 +0200
Subject: Enable initial sync and background jobs.

---
 service/pixelated/bitmask_libraries/session.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'service/pixelated/bitmask_libraries')

diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index d1bdac73..50f5e7c7 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -62,11 +62,12 @@ class LeapSession(object):
         self.account = soledad_account
         self.incoming_mail_fetcher = incoming_mail_fetcher
 
-        d = self.sync()
-        d.addCallback(lambda _: self.nicknym.generate_openpgp_key())
-
-        if self.config.start_background_jobs:
-            d.addCallback(lambda _: self.start_background_jobs())
+    @defer.inlineCallbacks
+    def initial_sync(self):
+        yield self.sync()
+        yield self.nicknym.generate_openpgp_key()
+        yield self.start_background_jobs()
+        defer.returnValue(self)
 
     def account_email(self):
         name = self.user_auth.username
@@ -78,6 +79,7 @@ class LeapSession(object):
     @defer.inlineCallbacks
     def start_background_jobs(self):
         self.incoming_mail_fetcher = yield self.incoming_mail_fetcher
+
         reactor.callFromThread(self.incoming_mail_fetcher.startService)
 
     def stop_background_jobs(self):
-- 
cgit v1.2.3