summaryrefslogtreecommitdiff
path: root/src/leap/mail/imap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-02-19 00:58:52 -0400
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-02-20 17:35:29 -0300
commit6eb1f599d49adc860efba3ccc30b15035dcaa6b0 (patch)
tree6c6eccc8eb0a8fc19bf963c7a2c0e200c36d157b /src/leap/mail/imap
parent1a0c34b145f0dfc1ea34d3670d93b4a0ce9ae4db (diff)
fix broken multipart attachment rendering
Diffstat (limited to 'src/leap/mail/imap')
-rw-r--r--src/leap/mail/imap/mailbox.py7
-rw-r--r--src/leap/mail/imap/service/imap-server.tac2
-rw-r--r--src/leap/mail/imap/service/imap.py4
3 files changed, 10 insertions, 3 deletions
diff --git a/src/leap/mail/imap/mailbox.py b/src/leap/mail/imap/mailbox.py
index 2f33aa0..499226c 100644
--- a/src/leap/mail/imap/mailbox.py
+++ b/src/leap/mail/imap/mailbox.py
@@ -463,6 +463,13 @@ class IMAPMailbox(object):
# switch to content-hash based index + local UID table.
is_sequence = True if uid == 0 else False
+
+ # XXX DEBUG --- if you attempt to use the `getmail` utility under
+ # imap/tests, it will choke until we implement sequence numbers. This
+ # is an easy hack meanwhile.
+ # is_sequence = False
+ # -----------------------------------------------------------------
+
getmsg = self.collection.get_message_by_uid
getimapmsg = self.get_imap_message
diff --git a/src/leap/mail/imap/service/imap-server.tac b/src/leap/mail/imap/service/imap-server.tac
index 49a29b1..2045757 100644
--- a/src/leap/mail/imap/service/imap-server.tac
+++ b/src/leap/mail/imap/service/imap-server.tac
@@ -124,8 +124,6 @@ km_kwargs = {
}
keymanager = KeyManager(*km_args, **km_kwargs)
-# XXX Do we need to wait until keymanager is properly initialized?
-
##################################################
# Ok, let's expose the application object for the twistd application
diff --git a/src/leap/mail/imap/service/imap.py b/src/leap/mail/imap/service/imap.py
index cc76e3a..3a6b7b8 100644
--- a/src/leap/mail/imap/service/imap.py
+++ b/src/leap/mail/imap/service/imap.py
@@ -136,7 +136,9 @@ def run_service(store, **kwargs):
:returns: the port as returned by the reactor when starts listening, and
the factory for the protocol.
"""
- leap_assert_type(store, Soledad)
+ leap_check(store, "store cannot be None")
+ # XXX this can also be a ProxiedObject, FIXME
+ # leap_assert_type(store, Soledad)
port = kwargs.get('port', IMAP_PORT)
userid = kwargs.get('userid', None)