summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-15 16:10:00 -0400
committerRuben Pollan <meskio@sindominio.net>2016-04-16 19:17:50 +0200
commit92f4b40ab48ec537aade244af3e3e4f2c17b1475 (patch)
tree917b7b3a2ce9f7d5da0fef229f77f5825da939ed /src
parente442eb8a3acf8e6bbddaabe7af90cf66d2c755ac (diff)
[refactor] adapt to the new Account signature
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/pix.py2
-rw-r--r--src/leap/bitmask/services/mail/imap.py2
-rw-r--r--src/leap/bitmask/services/mail/plumber.py3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/bitmask/pix.py b/src/leap/bitmask/pix.py
index 8d7d0811..b510106d 100644
--- a/src/leap/bitmask/pix.py
+++ b/src/leap/bitmask/pix.py
@@ -140,7 +140,7 @@ class LeapSessionAdapter(object):
self.fresh_account = False
self.incoming_mail_fetcher = None
- self.account = Account(soledad)
+ self.account = Account(soledad, userid)
username, provider = userid.split('@')
smtp_client_cert = os.path.join(
diff --git a/src/leap/bitmask/services/mail/imap.py b/src/leap/bitmask/services/mail/imap.py
index 54935f8c..2f000b2a 100644
--- a/src/leap/bitmask/services/mail/imap.py
+++ b/src/leap/bitmask/services/mail/imap.py
@@ -91,7 +91,7 @@ def start_incoming_mail_service(keymanager, soledad, userid):
check_period=get_mail_check_period())
return incoming_mail
- acc = Account(soledad)
+ acc = Account(soledad, userid)
d = acc.callWhenReady(lambda _: acc.get_collection_by_mailbox(INBOX_NAME))
d.addCallback(setUpIncomingMail)
d.addErrback(log.err)
diff --git a/src/leap/bitmask/services/mail/plumber.py b/src/leap/bitmask/services/mail/plumber.py
index 43203f0c..cd1f06bb 100644
--- a/src/leap/bitmask/services/mail/plumber.py
+++ b/src/leap/bitmask/services/mail/plumber.py
@@ -60,6 +60,7 @@ def initialize_soledad(uuid, email, passwd,
cert_file = ""
class Mock(object):
+
def __init__(self, return_value=None):
self._return = return_value
@@ -140,7 +141,7 @@ class MBOXPlumber(object):
self.sol = initialize_soledad(
self.uuid, self.userid, self.passwd,
secrets, localdb, "/tmp", "/tmp")
- self.acct = IMAPAccount(self.userid, self.sol)
+ self.acct = IMAPAccount(self.sol, self.userid)
return True
#