do not delete handshake messages maybe belonging to secure-joins on other devices

This commit is contained in:
B. Petersen
2020-01-24 12:50:26 +01:00
parent 8817cf5116
commit c54e211147

View File

@@ -626,8 +626,9 @@ pub(crate) fn handle_securejoin_handshake(
let ret = if join_vg {
HandshakeMessage::Propagate
} else {
HandshakeMessage::Done
HandshakeMessage::Ignore
};
if context.bob.read().unwrap().expects != DC_VC_CONTACT_CONFIRM {
info!(context, "Message belongs to a different handshake.",);
return Ok(ret);
@@ -713,7 +714,11 @@ pub(crate) fn handle_securejoin_handshake(
}
context.bob.write().unwrap().status = 1;
context.stop_ongoing();
Ok(ret)
Ok(if join_vg {
HandshakeMessage::Propagate
} else {
HandshakeMessage::Done
})
}
"vg-member-added-received" => {
/*==========================================================