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

refactor: MimeFactory::is_e2ee_guaranteed(): always respect Param::ForcePlaintext

Browse Source 
Even if a chat is protected, `Param::ForcePlaintext` in fact disables e2ee. Reflect this behaviour
in `MimeFactory::is_e2ee_guaranteed()`.
This commit is contained in:
iequidoo
2024-06-26 14:38:48 -03:00
committed by iequidoo
parent ce44312ac0
commit 4ed9c04e9b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mimefactory.rs
View File

@@ -286,14 +286,11 @@ impl MimeFactory {
fn is_e2ee_guaranteed(&self) -> bool { fn is_e2ee_guaranteed(&self) -> bool {
match &self.loaded { match &self.loaded {
Loaded::Message { chat, msg } => { Loaded::Message { chat, msg } => {
if chat.is_protected() {
return true;
}
!msg.param !msg.param
.get_bool(Param::ForcePlaintext) .get_bool(Param::ForcePlaintext)
.unwrap_or_default() .unwrap_or_default()
&& msg.param.get_bool(Param::GuaranteeE2ee).unwrap_or_default() && (chat.is_protected()
|| msg.param.get_bool(Param::GuaranteeE2ee).unwrap_or_default())
} }
Loaded::Mdn { .. } => false, Loaded::Mdn { .. } => false,
} }