diff options
Diffstat (limited to 'service/pixelated/bitmask_libraries')
| -rw-r--r-- | service/pixelated/bitmask_libraries/session.py | 4 | ||||
| -rw-r--r-- | service/pixelated/bitmask_libraries/smtp.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py index 925af0c0..60084731 100644 --- a/service/pixelated/bitmask_libraries/session.py +++ b/service/pixelated/bitmask_libraries/session.py @@ -25,6 +25,7 @@ from leap.auth import SRPAuth from .soledad import SoledadSessionFactory from .smtp import LeapSmtp from leap.mail.imap.account import IMAPAccount +from twisted.internet import defer SESSIONS = {} @@ -114,8 +115,7 @@ class LeapSessionFactory(object): account = self._create_account(account_email, soledad) incoming_mail_fetcher = self._create_incoming_mail_fetcher(nicknym, soledad, auth, auth.username) - # smtp = LeapSmtp(self._provider, auth, nicknym.keymanager) - smtp = None + smtp = LeapSmtp(self._provider, auth, nicknym.keymanager) return LeapSession(self._provider, auth, soledad, nicknym, account, incoming_mail_fetcher, smtp) diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py index 31e56995..ff2792fb 100644 --- a/service/pixelated/bitmask_libraries/smtp.py +++ b/service/pixelated/bitmask_libraries/smtp.py @@ -88,7 +88,7 @@ class LeapSmtp(object): self._local_smtp_service, self._local_smtp_service_socket = setup_smtp_gateway( port=self.local_smtp_port_number, - userid=email, + userid=str(email), keymanager=self._keymanager, smtp_host=self._remote_hostname.encode('UTF-8'), smtp_port=self._remote_port, |