From 7d399819f749107cdabdeaeeea330065580434da Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 4 Nov 2015 12:10:56 -0200 Subject: Fixed the get_body logic It won't break anymore if the body is None, but will return an empty body in that case --- mail/src/leap/mail/adaptors/soledad.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'mail') diff --git a/mail/src/leap/mail/adaptors/soledad.py b/mail/src/leap/mail/adaptors/soledad.py index 8de83f7e..7f2b1cf6 100644 --- a/mail/src/leap/mail/adaptors/soledad.py +++ b/mail/src/leap/mail/adaptors/soledad.py @@ -687,13 +687,14 @@ class MessageWrapper(object): :rtype: deferred """ body_phash = self.hdoc.body - if not body_phash: - if self.cdocs: - return self.cdocs[1] - d = store.get_doc('C-' + body_phash) - d.addCallback(lambda doc: ContentDocWrapper(**doc.content)) - return d - + if body_phash: + d = store.get_doc('C-' + body_phash) + d.addCallback(lambda doc: ContentDocWrapper(**doc.content)) + return d + elif self.cdocs: + return self.cdocs[1] + else: + return '' # # Mailboxes -- cgit v1.2.3