diff options
| -rw-r--r-- | src/leap/bitmask/mail/mail.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/pix.py | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/leap/bitmask/mail/mail.py b/src/leap/bitmask/mail/mail.py index 30fbd497..9f60ff00 100644 --- a/src/leap/bitmask/mail/mail.py +++ b/src/leap/bitmask/mail/mail.py @@ -392,9 +392,8 @@ class MessageCollection(object): @property def mbox_uuid(self): - # TODO raise instead? if self.mbox_wrapper is None: - return None + raise RuntimeError("This is not a mailbox collection") return self.mbox_wrapper.uuid def get_mbox_attr(self, attr): diff --git a/src/leap/bitmask/pix.py b/src/leap/bitmask/pix.py index 09394d7e..69067101 100644 --- a/src/leap/bitmask/pix.py +++ b/src/leap/bitmask/pix.py @@ -41,8 +41,6 @@ try: import pixelated_www HAS_PIXELATED = True except ImportError as exc: - print "CANNOT LOAD PIXELATED!..............." - print exc HAS_PIXELATED = False @@ -203,7 +201,13 @@ def _start_in_single_user_mode(leap_session, config, resource, services_factory): start_site(config, resource) reactor.callLater( - 0, start_user_agent_in_single_user_mode, + # workaround for #8798 + # we need to make pixelated initialization a bit behind + # the own leap initialization, because otherwise the inbox is created + # without the needed callbacks for IMAP compatibility. + # This should be better addressed at pixelated code, by using the mail + # api to create the collection. + 2, start_user_agent_in_single_user_mode, resource, services_factory, leap_session.config.leap_home, leap_session) |