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

refactor: deprecate Param::ErroneousE2ee

Browse Source
This commit is contained in:
link2xt
2024-12-25 01:42:57 +00:00
committed by l
parent 21664125d7
commit 779635d73b
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/chat.rs
View File

@@ -1991,9 +1991,6 @@ impl Chat {
.ok(); .ok();
} }
// reset encrypt error state eg. for forwarding
msg.param.remove(Param::ErroneousE2ee);
let is_bot = context.get_config_bool(Config::Bot).await?; let is_bot = context.get_config_bool(Config::Bot).await?;
msg.param msg.param
.set_optional(Param::Bot, Some("1").filter(|_| is_bot)); .set_optional(Param::Bot, Some("1").filter(|_| is_bot));

8
src/message.rs
View File

@@ -293,13 +293,7 @@ impl MsgId {
ret += ", Location sent"; ret += ", Location sent";
} }
let e2ee_errors = msg.param.get_int(Param::ErroneousE2ee).unwrap_or_default(); if 0 != msg.param.get_int(Param::GuaranteeE2ee).unwrap_or_default() {
if 0 != e2ee_errors {
if 0 != e2ee_errors & 0x2 {
ret += ", Encrypted, no valid signature";
}
} else if 0 != msg.param.get_int(Param::GuaranteeE2ee).unwrap_or_default() {
ret += ", Encrypted"; ret += ", Encrypted";
} }

2
src/param.rs
View File

@@ -55,6 +55,8 @@ pub enum Param {
/// For Messages: decrypted with validation errors or without mutual set, if neither /// For Messages: decrypted with validation errors or without mutual set, if neither
/// 'c' nor 'e' are preset, the messages is only transport encrypted. /// 'c' nor 'e' are preset, the messages is only transport encrypted.
///
/// Deprecated on 2024-12-25.
ErroneousE2ee = b'e', ErroneousE2ee = b'e',
/// For Messages: force unencrypted message, a value from `ForcePlaintext` enum. /// For Messages: force unencrypted message, a value from `ForcePlaintext` enum.