diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index edab45fda..208c6f1b5 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -4394,7 +4394,7 @@ int64_t dc_lot_get_timestamp (const dc_lot_t* lot); * @param data2 (int) contact_id * @return 0 */ -#define DC_EVENT_SECUREJOIN_SUCCEEDED 2062 +#define DC_EVENT_SECUREJOIN_MEMBER_ADDED 2062 /** diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index ecccaf4b6..f1f8697b8 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -175,7 +175,7 @@ impl ContextWrapper { contact_id as uintptr_t, progress as uintptr_t, ), - Event::SecurejoinSucceeded { + Event::SecurejoinMemberAdded { chat_id, contact_id, } => ffi_cb( diff --git a/python/src/deltachat/const.py b/python/src/deltachat/const.py index 8fbf26d6c..1d7bfd9f1 100644 --- a/python/src/deltachat/const.py +++ b/python/src/deltachat/const.py @@ -98,7 +98,7 @@ DC_EVENT_IMEX_PROGRESS = 2051 DC_EVENT_IMEX_FILE_WRITTEN = 2052 DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060 DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061 -DC_EVENT_SECUREJOIN_SUCCEEDED = 2062 +DC_EVENT_SECUREJOIN_MEMBER_ADDED = 2062 DC_EVENT_FILE_COPIED = 2055 DC_EVENT_IS_OFFLINE = 2081 DC_EVENT_GET_STRING = 2091 diff --git a/python/tests/test_account.py b/python/tests/test_account.py index 0a76cf3da..008645d2f 100644 --- a/python/tests/test_account.py +++ b/python/tests/test_account.py @@ -768,7 +768,7 @@ class TestOnlineAccount: ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED") ac2._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED") wait_securejoin_inviter_progress(ac1, 1000) - ac1._evlogger.get_matching("DC_EVENT_SECUREJOIN_SUCCEEDED") + ac1._evlogger.get_matching("DC_EVENT_SECUREJOIN_MEMBER_ADDED") def test_qr_verified_group_and_chatting(self, acfactory, lp): ac1, ac2 = acfactory.get_two_online_accounts() diff --git a/src/events.rs b/src/events.rs index c14507bca..600541e56 100644 --- a/src/events.rs +++ b/src/events.rs @@ -249,5 +249,5 @@ pub enum Event { /// @param data2 (int) contact_id /// @return 0 #[strum(props(id = "2062"))] - SecurejoinSucceeded { chat_id: u32, contact_id: u32 }, + SecurejoinMemberAdded { chat_id: u32, contact_id: u32 }, } diff --git a/src/securejoin.rs b/src/securejoin.rs index f4b0d53b6..c8bb79421 100644 --- a/src/securejoin.rs +++ b/src/securejoin.rs @@ -615,7 +615,7 @@ pub fn handle_securejoin_handshake( .lookup_optional_field("Secure-Join-Group") .unwrap_or_default(); let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, &field_grpid); - context.call_cb(Event::SecurejoinSucceeded { + context.call_cb(Event::SecurejoinMemberAdded { chat_id: group_chat_id, contact_id: contact_id, });