Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-21 23:46:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v1.142.11'

Browse Source
This commit is contained in:
link2xt
2024-08-30 22:38:15 +00:00
parent 93e181b2da fcf3dbbad4
commit 9d47be0d8a
15 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/securejoin.rs
View File

@@ -637,6 +637,10 @@ pub(crate) async fn observe_securejoin_on_other_device(
return Ok(HandshakeMessage::Ignore);
};
peerstate.set_verified(key.clone(), fingerprint, addr)?;
if matches!(step, "vg-member-added" | "vc-contact-confirm") {
peerstate.backward_verified_key_id =
Some(context.get_config_i64(Config::KeyId).await?).filter(|&id| id > 0);
}
peerstate.prefer_encrypt = EncryptPreference::Mutual;
peerstate.save_to_db(&context.sql).await?;