diff options
Diffstat (limited to 'src/leap/mail/imap')
-rw-r--r-- | src/leap/mail/imap/fetch.py | 10 | ||||
-rw-r--r-- | src/leap/mail/imap/server.py | 5 | ||||
-rw-r--r-- | src/leap/mail/imap/service/imap-server.tac | 2 | ||||
-rw-r--r-- | src/leap/mail/imap/service/imap.py | 2 | ||||
-rw-r--r-- | src/leap/mail/imap/tests/__init__.py | 4 | ||||
-rw-r--r-- | src/leap/mail/imap/tests/test_imap.py | 4 |
6 files changed, 11 insertions, 16 deletions
diff --git a/src/leap/mail/imap/fetch.py b/src/leap/mail/imap/fetch.py index 3b15c6a..802ce26 100644 --- a/src/leap/mail/imap/fetch.py +++ b/src/leap/mail/imap/fetch.py @@ -29,7 +29,8 @@ from twisted.internet.threads import deferToThread from leap.common import events as leap_events from leap.common.check import leap_assert, leap_assert_type -from leap.soledad import Soledad +from leap.soledad.client import Soledad +from leap.soledad.common.crypto import ENC_SCHEME_KEY, ENC_JSON_KEY from leap.common.events.events_pb2 import IMAP_FETCHED_INCOMING from leap.common.events.events_pb2 import IMAP_MSG_PROCESSING @@ -47,9 +48,6 @@ class LeapIncomingMail(object): Fetches mail from the incoming queue. """ - ENC_SCHEME_KEY = "_enc_scheme" - ENC_JSON_KEY = "_enc_json" - RECENT_FLAG = "\\Recent" INCOMING_KEY = "incoming" @@ -159,11 +157,11 @@ class LeapIncomingMail(object): leap_events.signal( IMAP_MSG_PROCESSING, str(index), str(num_mails)) keys = doc.content.keys() - if self.ENC_SCHEME_KEY in keys and self.ENC_JSON_KEY in keys: + if ENC_SCHEME_KEY in keys and ENC_JSON_KEY in keys: # XXX should check for _enc_scheme == "pubkey" || "none" # that is what incoming mail uses. - encdata = doc.content[self.ENC_JSON_KEY] + encdata = doc.content[ENC_JSON_KEY] defer.Deferred(self._decrypt_msg(doc, encdata)) else: logger.debug('This does not look like a proper msg.') diff --git a/src/leap/mail/imap/server.py b/src/leap/mail/imap/server.py index 7890a76..a69eb3f 100644 --- a/src/leap/mail/imap/server.py +++ b/src/leap/mail/imap/server.py @@ -36,10 +36,7 @@ from twisted.python import log #import u1db from leap.common.check import leap_assert, leap_assert_type -from leap.soledad import Soledad -from leap.soledad.sqlcipher import SQLCipherDatabase -from leap.common.events import signal -from leap.common.events import events_pb2 as proto +from leap.soledad.client import Soledad logger = logging.getLogger(__name__) diff --git a/src/leap/mail/imap/service/imap-server.tac b/src/leap/mail/imap/service/imap-server.tac index 16d04bb..8638be2 100644 --- a/src/leap/mail/imap/service/imap-server.tac +++ b/src/leap/mail/imap/service/imap-server.tac @@ -3,7 +3,7 @@ import os from xdg import BaseDirectory -from leap.soledad import Soledad +from leap.soledad.client import Soledad from leap.mail.imap.service import imap diff --git a/src/leap/mail/imap/service/imap.py b/src/leap/mail/imap/service/imap.py index 09ac542..b4776f2 100644 --- a/src/leap/mail/imap/service/imap.py +++ b/src/leap/mail/imap/service/imap.py @@ -33,7 +33,7 @@ from leap.common.check import leap_assert, leap_assert_type from leap.keymanager import KeyManager from leap.mail.imap.server import SoledadBackedAccount from leap.mail.imap.fetch import LeapIncomingMail -from leap.soledad import Soledad +from leap.soledad.client import Soledad IMAP_PORT = 1984 # The default port in which imap service will run diff --git a/src/leap/mail/imap/tests/__init__.py b/src/leap/mail/imap/tests/__init__.py index fdeda76..f3d5ca6 100644 --- a/src/leap/mail/imap/tests/__init__.py +++ b/src/leap/mail/imap/tests/__init__.py @@ -22,8 +22,8 @@ import u1db from leap.common.testing.basetest import BaseLeapTest -from leap.soledad import Soledad -from leap.soledad.document import SoledadDocument +from leap.soledad.client import Soledad +from leap.soledad.common.document import SoledadDocument #----------------------------------------------------------------------------- diff --git a/src/leap/mail/imap/tests/test_imap.py b/src/leap/mail/imap/tests/test_imap.py index 8804fe0..3411795 100644 --- a/src/leap/mail/imap/tests/test_imap.py +++ b/src/leap/mail/imap/tests/test_imap.py @@ -61,8 +61,8 @@ from leap.mail.imap.server import SoledadMailbox from leap.mail.imap.server import SoledadBackedAccount from leap.mail.imap.server import MessageCollection -from leap.soledad import Soledad -from leap.soledad import SoledadCrypto +from leap.soledad.client import Soledad +from leap.soledad.client import SoledadCrypto def strip(f): |