From 8a59e46a0a232a1ef5901fc20416e8ec4ff5717b Mon Sep 17 00:00:00 2001 From: Edouard Tisserant Date: Fri, 9 Dec 2016 01:38:02 +0100 Subject: [PATCH] uses new sync app notification enum names in mp_sync_test --- src/pEpmodule.cc | 13 +++++++------ test/multipEp.py | 5 ++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pEpmodule.cc b/src/pEpmodule.cc index 7bb7daf..18be6a0 100644 --- a/src/pEpmodule.cc +++ b/src/pEpmodule.cc @@ -348,12 +348,13 @@ BOOST_PYTHON_MODULE(pEp) // key sync API enum_("sync_handshake_signal") - .value("SYNC_HANDSHAKE_DISMISS_DIALOG",SYNC_HANDSHAKE_DISMISS_DIALOG) - .value("SYNC_HANDSHAKE_SHOW_DIALOG" ,SYNC_HANDSHAKE_SHOW_DIALOG) - .value("SYNC_HANDSHAKE_SUCCESS" ,SYNC_HANDSHAKE_SUCCESS) - .value("SYNC_HANDSHAKE_FAILURE" ,SYNC_HANDSHAKE_FAILURE) - .value("SYNC_DEVICE_ADDED" ,SYNC_DEVICE_ADDED) - .value("SYNC_GROUP_CREATED" ,SYNC_GROUP_CREATED); + .value("SYNC_NOTIFY_UNDEFINED" , SYNC_NOTIFY_UNDEFINED) + .value("SYNC_NOTIFY_INIT_ADD_OUR_DEVICE" , SYNC_NOTIFY_INIT_ADD_OUR_DEVICE) + .value("SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE" , SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE) + .value("SYNC_NOTIFY_INIT_FORM_GROUP" , SYNC_NOTIFY_INIT_FORM_GROUP) + .value("SYNC_NOTIFY_TIMEOUT" , SYNC_NOTIFY_TIMEOUT) + .value("SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED" , SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED) + .value("SYNC_NOTIFY_ACCEPTED_GROUP_CREATED", SYNC_NOTIFY_ACCEPTED_GROUP_CREATED); auto sync_mixin_class = class_( "SyncMixIn", diff --git a/test/multipEp.py b/test/multipEp.py index 7c0908c..152951c 100644 --- a/test/multipEp.py +++ b/test/multipEp.py @@ -260,7 +260,10 @@ def pEp_instance_run(iname, _own_addresses, conn, _msgs_folders, _handshakes_see _send_message(rcpt.address, msg) def notifyHandshake(self, me, partner, signal): - if signal == pEp.sync_handshake_signal.SYNC_HANDSHAKE_SHOW_DIALOG: + if signal in [ + pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_ADD_OUR_DEVICE, + pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE, + pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_FORM_GROUP]: printheader("show HANDSHAKE dialog") printi("handshake needed between " + repr(me) + " and " + repr(partner)) tw = pEp.trustwords(me, partner, 'en')