From 63022878d0e93f87c7e866ca143109d9cf1111f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Tue, 13 Aug 2013 15:12:51 -0300
Subject: Ignore empty emails
---
mail/src/leap/mail/imap/fetch.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'mail/src')
diff --git a/mail/src/leap/mail/imap/fetch.py b/mail/src/leap/mail/imap/fetch.py
index 9b76592f..4a939fd3 100644
--- a/mail/src/leap/mail/imap/fetch.py
+++ b/mail/src/leap/mail/imap/fetch.py
@@ -125,14 +125,15 @@ class LeapIncomingMail(object):
# XXX should check for _enc_scheme == "pubkey" || "none"
# that is what incoming mail uses.
encdata = doc.content[self.ENC_JSON_KEY]
- d = defer.Deferred(self._decrypt_msg(doc, encdata))
- d.addCallbacks(self._process_decrypted, log.msg)
+ defer.Deferred(self._decrypt_msg(doc, encdata))
else:
logger.debug('This does not look like a proper msg.')
def _decrypt_msg(self, doc, encdata):
log.msg('decrypting msg')
key = self._pkey
+ if len(encdata) == 0:
+ return
decrdata = (self._keymanager.decrypt(
encdata, key,
# XXX get from public method instead
--
cgit v1.2.3