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

Make sure the resetup happy path works

Browse Source
This commit is contained in:
Hocuri
2023-11-09 13:52:12 +01:00
committed by holger krekel
parent 091bc1ab13
commit ac39c3699b
1 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/receive_imf.rs
View File

@@ -1678,17 +1678,6 @@ async fn create_or_lookup_group(
members.dedup();
chat::add_to_chat_contacts_table(context, new_chat_id, &members).await?;
// once, we have protected-chats explained in UI, we can uncomment the following lines.
// ("verified groups" did not add a message anyway)
//
//if create_protected == ProtectionStatus::Protected {
// set from_id=0 as it is not clear that the sender of this random group message
// actually really has enabled chat-protection at some point.
//new_chat_id
// .add_protection_msg(context, ProtectionStatus::Protected, false, 0)
// .await?;
//}
context.emit_event(EventType::ChatModified(new_chat_id));
}
@@ -1791,7 +1780,12 @@ async fn apply_group_changes(
if !chat.is_protected() {
chat_id
.inner_set_protection(context, ProtectionStatus::Protected)
.set_protection(
context,
ProtectionStatus::Protected,
smeared_time(context),
Some(from_id),
)
.await?;
}
}
@@ -2453,6 +2447,40 @@ async fn has_verified_encryption(
if let Some(fp) = peerstate.gossip_key_fingerprint.clone() {
peerstate.set_verified(PeerstateKeyType::GossipKey, fp, verifier_addr)?;
peerstate.save_to_db(&context.sql).await?;
// TODO check if in other places where set_verified() is used we should also
// also set the chat as verified (& create a hidden chat if necessary)
// TODO There is may be some code duplication with other code added recently
// and also some function should be extracted here because has_verified_encryption()
// is becoming very long and nested
if !is_verified {
let to_id = Contact::add_or_lookup(
context,
"",
ContactAddress::new(&to_addr)?,
Origin::Hidden,
)
.await?
.0;
let chat_id = ChatId::create_for_contact_with_blocked(
context,
to_id,
Blocked::Yes,
)
.await
.with_context(|| {
format!("can't create chat for contact {}", to_addr)
})?;
chat_id
.set_protection(
context,
ProtectionStatus::Protected,
smeared_time(context),
Some(to_id),
)
.await?;
}
}
} else {
// The contact already has a verified key.