From 4ed9c04e9be46d144fa5a0ccf60e44c76a0b325e Mon Sep 17 00:00:00 2001 From: iequidoo Date: Wed, 26 Jun 2024 14:38:48 -0300 Subject: [PATCH] refactor: MimeFactory::is_e2ee_guaranteed(): always respect Param::ForcePlaintext Even if a chat is protected, `Param::ForcePlaintext` in fact disables e2ee. Reflect this behaviour in `MimeFactory::is_e2ee_guaranteed()`. --- src/mimefactory.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mimefactory.rs b/src/mimefactory.rs index b79f18188..725722d7d 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -286,14 +286,11 @@ impl MimeFactory { fn is_e2ee_guaranteed(&self) -> bool { match &self.loaded { Loaded::Message { chat, msg } => { - if chat.is_protected() { - return true; - } - !msg.param .get_bool(Param::ForcePlaintext) .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, }