summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/mail/imapcontroller.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-12-08 21:04:11 -0400
committerKali Kaneko <kali@leap.se>2015-12-15 12:31:04 -0400
commit98384361a7c49ad4e0ff0127fd923a8b72cc910a (patch)
treec315b65397ac97210d6f1a3ee5e521b4d8917678 /src/leap/bitmask/services/mail/imapcontroller.py
parent6c0299e7e2df65651ff8738fa18acbc08af18c32 (diff)
[feat] adapt to use cred-based authentication for imap
This includes getting the token for the imap authentication, and displaying it on the help window. - Resolves: #4469 - Releases: 0.10.0
Diffstat (limited to 'src/leap/bitmask/services/mail/imapcontroller.py')
-rw-r--r--src/leap/bitmask/services/mail/imapcontroller.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/leap/bitmask/services/mail/imapcontroller.py b/src/leap/bitmask/services/mail/imapcontroller.py
index 5053d897..855fb74b 100644
--- a/src/leap/bitmask/services/mail/imapcontroller.py
+++ b/src/leap/bitmask/services/mail/imapcontroller.py
@@ -60,9 +60,9 @@ class IMAPController(object):
"""
logger.debug('Starting imap service')
+ soledad_sessions = {userid: self._soledad}
self.imap_port, self.imap_factory = imap.start_imap_service(
- self._soledad,
- userid=userid)
+ soledad_sessions)
def start_and_assign_incoming_service(incoming_mail):
# this returns a deferred that will be called when the looping call
@@ -74,9 +74,7 @@ class IMAPController(object):
if offline is False:
d = imap.start_incoming_mail_service(
- self._keymanager,
- self._soledad,
- self.imap_factory,
+ self._keymanager, self._soledad,
userid)
d.addCallback(start_and_assign_incoming_service)
d.addErrback(lambda f: logger.error(f.printTraceback()))