Browse Source

PEP_MESSAGE_DISCARDED

PYADPT-55
Edouard Tisserant 9 years ago
parent
commit
98008c22c9
  1. 6
      src/message_api.cc
  2. 2
      src/pEpmodule.cc
  3. 6
      test/multipEp.py

6
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)

2
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)

6
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)

Loading…
Cancel
Save