Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 23:06:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

do not delete handshake-messages needed for a multi-device-verification

Browse Source
This commit is contained in:
B. Petersen
2020-02-28 14:58:29 +01:00
committed by holger krekel
parent 016a780632
commit 24730e7ad6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/securejoin.rs
View File

@@ -622,7 +622,7 @@ pub(crate) fn handle_securejoin_handshake(
send_handshake_msg(context, contact_chat_id, "vc-contact-confirm", "", None, ""); send_handshake_msg(context, contact_chat_id, "vc-contact-confirm", "", None, "");
inviter_progress!(context, contact_id, 1000); inviter_progress!(context, contact_id, 1000);
} }
Ok(HandshakeMessage::Done) Ok(HandshakeMessage::Ignore) // "Done" would delete the message and break multi-device (the key from Autocrypt-header is needed)
} }
"vg-member-added" | "vc-contact-confirm" => { "vg-member-added" | "vc-contact-confirm" => {
/*======================================================= /*=======================================================
@@ -723,7 +723,7 @@ pub(crate) fn handle_securejoin_handshake(
Ok(if join_vg { Ok(if join_vg {
HandshakeMessage::Propagate HandshakeMessage::Propagate
} else { } else {
HandshakeMessage::Done HandshakeMessage::Ignore // "Done" deletes the message and breaks multi-device
}) })
} }
"vg-member-added-received" => { "vg-member-added-received" => {
@@ -754,7 +754,7 @@ pub(crate) fn handle_securejoin_handshake(
chat_id: group_chat_id, chat_id: group_chat_id,
contact_id, contact_id,
}); });
Ok(HandshakeMessage::Done) Ok(HandshakeMessage::Ignore) // "Done" deletes the message and breaks multi-device
} else { } else {
warn!(context, "vg-member-added-received invalid.",); warn!(context, "vg-member-added-received invalid.",);
Ok(HandshakeMessage::Ignore) Ok(HandshakeMessage::Ignore)