From 98008c22c9996c726ce954dbf1fa639b58dfb875 Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <edouard@pep-project.org>
Date: Wed, 21 Sep 2016 12:41:54 +0200
Subject: [PATCH] PEP_MESSAGE_DISCARDED

---
 src/message_api.cc | 6 ++++--
 src/pEpmodule.cc   | 2 ++
 test/multipEp.py   | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/message_api.cc b/src/message_api.cc
index d52faf4..dc336f7 100644
--- a/src/message_api.cc
+++ b/src/message_api.cc
@@ -51,10 +51,12 @@ namespace pEp {
 
             int rating = (int) _rating;
             int flags = (int) _flags;
-            bool consumed = status == PEP_MESSAGE_CONSUMED;
+            string sync_status  = status == PEP_MESSAGE_CONSUMED ? "MESSAGE_CONSUMED" :
+                                  status == PEP_MESSAGE_DISCARDED ? "MESSAGE_DISCARDED" :
+                                  "";
 
             Message dst = _dst ? Message(_dst) : Message(src);
-            return boost::python::make_tuple(dst, keylist, rating, consumed, flags);
+            return boost::python::make_tuple(dst, keylist, rating, sync_status, flags);
         }
 
         int _color(int rating)
diff --git a/src/pEpmodule.cc b/src/pEpmodule.cc
index 3e37223..8f34e98 100644
--- a/src/pEpmodule.cc
+++ b/src/pEpmodule.cc
@@ -34,6 +34,8 @@ namespace pEp {
                 return;
             if (status == PEP_MESSAGE_CONSUMED)
                 return;
+            if (status == PEP_MESSAGE_DISCARDED)
+                return;
             if (status == PEP_OUT_OF_MEMORY)
                 throw bad_alloc();
             if (status == PEP_ILLEGAL_VALUE)
diff --git a/test/multipEp.py b/test/multipEp.py
index 3ac078e..7176f33 100644
--- a/test/multipEp.py
+++ b/test/multipEp.py
@@ -70,7 +70,7 @@ def pEp_instance_run(iname, conn, msgs_folders, handshakes_seen, handshakes_vali
         def showHandshake(self, me, partner):
             printheader("show HANDSHAKE dialog")
             printi("handshake needed between " + repr(me) + " and " + repr(partner))
-            tw = pEp.trustwords(me,partner,'en')
+            tw = pEp.trustwords(me, partner, 'en')
             printi(tw)
             if tw in handshakes_seen :
                 handshakes_seen.remove(tw)
@@ -102,13 +102,15 @@ def pEp_instance_run(iname, conn, msgs_folders, handshakes_seen, handshakes_vali
                 printmsg(msg)
                 msg2, keys, rating, consumed, flags = msg.decrypt()
 
-                if consumed: #PEP_MESSAGE_CONSUMED
+                if consumed == "MESSAGE_CONSUMED":
                     printi("--- PEP_MESSAGE_CONSUMED")
                     # folder may have changed in the meantime,
                     # remove item directly from latest version of it.
                     folder = msgs_folders[own_address]
                     folder.remove(msgstr)
                     msgs_folders[own_address] = folder
+                elif consumed == "MESSAGE_DISCARDED":
+                    printi("--- PEP_MESSAGE_DISCARDED")
                 else :
                     printi("->-")
                     printmsg(msg2)