Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 17:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename to more specific name, also not using the difficult to type "succeeded" word :)

Browse Source
This commit is contained in:
holger krekel
2019-11-27 06:27:43 +01:00
committed by Floris Bruynooghe
parent 618d74cd67
commit 76610f1e72
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deltachat-ffi/deltachat.h
View File

@@ -4394,7 +4394,7 @@ int64_t dc_lot_get_timestamp (const dc_lot_t* lot);
* @param data2 (int) contact_id * @param data2 (int) contact_id
* @return 0 * @return 0
*/ */
#define DC_EVENT_SECUREJOIN_SUCCEEDED 2062 #define DC_EVENT_SECUREJOIN_MEMBER_ADDED 2062
/** /**

2
deltachat-ffi/src/lib.rs
View File

@@ -175,7 +175,7 @@ impl ContextWrapper {
contact_id as uintptr_t, contact_id as uintptr_t,
progress as uintptr_t, progress as uintptr_t,
), ),
Event::SecurejoinSucceeded { Event::SecurejoinMemberAdded {
chat_id, chat_id,
contact_id, contact_id,
} => ffi_cb( } => ffi_cb(

2
python/src/deltachat/const.py
View File

@@ -98,7 +98,7 @@ DC_EVENT_IMEX_PROGRESS = 2051
DC_EVENT_IMEX_FILE_WRITTEN = 2052 DC_EVENT_IMEX_FILE_WRITTEN = 2052
DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060 DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060
DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061 DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061
DC_EVENT_SECUREJOIN_SUCCEEDED = 2062 DC_EVENT_SECUREJOIN_MEMBER_ADDED = 2062
DC_EVENT_FILE_COPIED = 2055 DC_EVENT_FILE_COPIED = 2055
DC_EVENT_IS_OFFLINE = 2081 DC_EVENT_IS_OFFLINE = 2081
DC_EVENT_GET_STRING = 2091 DC_EVENT_GET_STRING = 2091

2
python/tests/test_account.py
View File

@@ -768,7 +768,7 @@ class TestOnlineAccount:
ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED") ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
ac2._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED") ac2._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
wait_securejoin_inviter_progress(ac1, 1000) 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): def test_qr_verified_group_and_chatting(self, acfactory, lp):
ac1, ac2 = acfactory.get_two_online_accounts() ac1, ac2 = acfactory.get_two_online_accounts()

2
src/events.rs
View File

@@ -249,5 +249,5 @@ pub enum Event {
/// @param data2 (int) contact_id /// @param data2 (int) contact_id
/// @return 0 /// @return 0
#[strum(props(id = "2062"))] #[strum(props(id = "2062"))]
SecurejoinSucceeded { chat_id: u32, contact_id: u32 }, SecurejoinMemberAdded { chat_id: u32, contact_id: u32 },
} }

2
src/securejoin.rs
View File

@@ -615,7 +615,7 @@ pub fn handle_securejoin_handshake(
.lookup_optional_field("Secure-Join-Group") .lookup_optional_field("Secure-Join-Group")
.unwrap_or_default(); .unwrap_or_default();
let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, &field_grpid); 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, chat_id: group_chat_id,
contact_id: contact_id, contact_id: contact_id,
}); });