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

skip protection enabled/disabled messages where they did not appear in the past with verified-groups

Browse Source 
this avoids confusion - as long the current core
does not communicate with a UI that enables/disables protection,
everything looks just the same as in the past :)
This commit is contained in:
B. Petersen
2020-10-17 23:14:13 +02:00
committed by holger krekel
parent 0ae9443e22
commit e15372531e
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/chat.rs
View File

@@ -2034,7 +2034,9 @@ pub async fn create_group_chat(
});
if protect == ProtectionStatus::Protected {
chat_id.set_protection(context, protect).await?;
// this part is to stay compatible to verified groups,
// in some future, we will drop the "protect"-flag from create_group_chat()
chat_id.inner_set_protection(context, protect).await?;
}
Ok(chat_id)

17
src/dc_receive_imf.rs
View File

@@ -1244,13 +1244,16 @@ async fn create_or_lookup_group(
chat_id_blocked = create_blocked;
recreate_member_list = true;
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.
chat_id
.add_protection_msg(context, ProtectionStatus::Protected, false, 0)
.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.
//chat_id
// .add_protection_msg(context, ProtectionStatus::Protected, false, 0)
// .await?;
//}
}
// again, check chat_id