From 9195a49292e547e333e2dbc74e7c9699b84c4e11 Mon Sep 17 00:00:00 2001 From: Edouard Tisserant Date: Thu, 10 Nov 2016 21:18:55 +0100 Subject: [PATCH] Better english for KeySync messages status flags --- src/message_api.cc | 8 ++++---- test/multipEp.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/message_api.cc b/src/message_api.cc index 9c6fa34..ddd0dc5 100644 --- a/src/message_api.cc +++ b/src/message_api.cc @@ -51,10 +51,10 @@ namespace pEp { int rating = (int) _rating; int flags = (int) _flags; - string sync_status = flags & PEP_decrypt_flag_discarded ? - "MESSAGE_DISCARDED" : - flags & PEP_decrypt_flag_consumed ? - "MESSAGE_CONSUMED" : ""; + string sync_status = flags & PEP_decrypt_flag_ignore ? + "MESSAGE_IGNORE" : + flags & PEP_decrypt_flag_consume ? + "MESSAGE_CONSUME" : ""; Message dst = _dst ? Message(_dst) : Message(src); return boost::python::make_tuple(dst, keylist, rating, sync_status, flags); diff --git a/test/multipEp.py b/test/multipEp.py index 72264a6..5ffe591 100644 --- a/test/multipEp.py +++ b/test/multipEp.py @@ -135,14 +135,14 @@ def execute_order(order, handler): printmsg(msg) msg2, keys, rating, consumed, flags = msg.decrypt() - if consumed == "MESSAGE_CONSUMED": + if consumed == "MESSAGE_CONSUME": 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": + elif consumed == "MESSAGE_IGNORE": printi("--- PEP_MESSAGE_DISCARDED") else : printi("->-", rating, "->-")