Moves welcome mail logic inside LeapSession

1 files changed, 11 insertions, 0 deletions

diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index 7abe2a63..da62b084 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -28,6 +28,12 @@ from .smtp import LeapSmtp
 from leap.mail.imap.account import IMAPAccount
 from twisted.internet import defer
 
+from leap.common.events import (
+    register,
+    catalog as events
+)
+
+
 SESSIONS = {}
 
 
@@ -63,6 +69,8 @@ class LeapSession(object):
         self.mail_store = mail_store
         self.soledad_session = soledad_session
         self.nicknym = nicknym
+        self.fresh_account = False
+        register(events.KEYMANAGER_FINISHED_KEY_GENERATION, self._set_fresh_account)
 
     @defer.inlineCallbacks
     def initial_sync(self):
@@ -85,6 +93,9 @@ class LeapSession(object):
         account = IMAPAccount(user_mail, soledad_session.soledad)
         return account
 
+    def _set_fresh_account(self, *args):
+        self.fresh_account = True
+
     def account_email(self):
         name = self.user_auth.username
         return self.provider.address_for(name)