summaryrefslogtreecommitdiff
path: root/service/app/bitmask_libraries/session.py
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2014-08-08 18:01:48 +0200
committerFolker Bernitt <fbernitt@thoughtworks.com>2014-08-08 18:03:58 +0200
commit77b12bda3df10710daf7c441512146170523f003 (patch)
treee8332c492d79e8b7482e5a5b560f14213cc8933a /service/app/bitmask_libraries/session.py
parentd3a31756c17165d4685287868f53265e49762377 (diff)
Updated some leap components to latest version.
- Send public key to leap now works - Fetching mail works with a recent leap provider version - Added register to LeapAuthenticator to create a new account
Diffstat (limited to 'service/app/bitmask_libraries/session.py')
-rw-r--r--service/app/bitmask_libraries/session.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/service/app/bitmask_libraries/session.py b/service/app/bitmask_libraries/session.py
index 66e4fcab..d4b507dc 100644
--- a/service/app/bitmask_libraries/session.py
+++ b/service/app/bitmask_libraries/session.py
@@ -2,8 +2,10 @@ import os
import errno
import traceback
from leap.mail.imap.fetch import LeapIncomingMail
-from leap.mail.imap.server import SoledadBackedAccount
+from leap.mail.imap.account import SoledadBackedAccount
import sys
+from leap.mail.imap.memorystore import MemoryStore
+from leap.mail.imap.soledadstore import SoledadStore
from twisted.internet import reactor
from .nicknym import NickNym
@@ -138,7 +140,8 @@ class LeapSessionFactory(object):
return NickNym(self._provider, self._config, soledad_session, srp_session)
def _create_account(self, srp_session, soledad_session):
- return SoledadBackedAccount(srp_session.uuid, soledad_session.soledad)
+ memstore = MemoryStore(permanent_store=SoledadStore(soledad_session.soledad))
+ return SoledadBackedAccount(srp_session.uuid, soledad_session.soledad, memstore)
def _create_incoming_mail_fetcher(self, nicknym, soledad_session, account, auth):
return LeapIncomingMail(nicknym.keymanager, soledad_session.soledad, account,