From 61e84cee60ef1490ddf3bd82eec1d20e8e294ceb Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 26 Nov 2013 16:50:10 -0200
Subject: fix adding msg with empty flags

---
 mail/changes/bug_fix-empty-flags  | 1 +
 mail/src/leap/mail/imap/server.py | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 mail/changes/bug_fix-empty-flags

(limited to 'mail')

diff --git a/mail/changes/bug_fix-empty-flags b/mail/changes/bug_fix-empty-flags
new file mode 100644
index 00000000..a109ef56
--- /dev/null
+++ b/mail/changes/bug_fix-empty-flags
@@ -0,0 +1 @@
+  o Fix a bug when adding a message with empty flags. Closes: #4496
diff --git a/mail/src/leap/mail/imap/server.py b/mail/src/leap/mail/imap/server.py
index abe1dfa2..733944c6 100644
--- a/mail/src/leap/mail/imap/server.py
+++ b/mail/src/leap/mail/imap/server.py
@@ -1438,12 +1438,14 @@ class SoledadMailbox(WithMsgFields):
         """
         # XXX we should treat the message as an IMessage from here
         uid_next = self.getUIDNext()
-        flags = tuple(str(flag) for flag in flags)
+        if flags is None:
+            flags = tuple()
+        else:
+            flags = tuple(str(flag) for flag in flags)
 
         self.messages.add_msg(message, flags=flags, date=date,
                               uid=uid_next)
 
-        # XXX recent should not include deleted...??
         exists = len(self.messages)
         recent = len(self.messages.get_recent())
         for listener in self.listeners:
-- 
cgit v1.2.3