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

fix: Add messages that can't be verified as DownloadState::Available (#7059)

Browse Source 
We haven't dropped verified groups yet, so we need to do smth with messages that can't be verified
yet which often occurs because of messages reordering, particularly in large groups. Apart from the
reported case #7059, i had other direct reports that sometimes messages can't be verified for
various reasons, but when the reason is already fixed, it should be possible to re-download failed
messages and see them.

Also remove the code replacing the message text with a verification error from
`apply_group_changes()` as `add_parts()` already does this.
This commit is contained in:
iequidoo
2025-08-10 13:13:09 -03:00
committed by iequidoo
parent d13eb2f580
commit 4157d1986f
2 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/receive_imf.rs
View File

@@ -1863,6 +1863,7 @@ async fn add_parts(
None
};
let mut verification_failed = false;
if !chat_id.is_special() && is_partial_download.is_none() {
// For outgoing emails in the 1:1 chat we have an exception that
// they are allowed to be unencrypted:
@@ -1874,8 +1875,9 @@ async fn add_parts(
// likely reinstalled DC" or similar) would be wrong.
if chat.is_protected() && (mime_parser.incoming || chat.typ != Chattype::Single) {
if let VerifiedEncryption::NotVerified(err) = verified_encryption {
verification_failed = true;
warn!(context, "Verification problem: {err:#}.");
let s = format!("{err}. See 'Info' for more details");
let s = format!("{err}. Re-download the message or see 'Info' for more details");
mime_parser.replace_msg_by_error(&s);
}
}
@@ -2137,6 +2139,10 @@ RETURNING id
DownloadState::Available
} else if mime_parser.decrypting_failed {
DownloadState::Undecipherable
} else if verification_failed {
// Verification can fail because of message reordering. Re-downloading the
// message should help if so.
DownloadState::Available
} else {
DownloadState::Done
},
@@ -2871,20 +2877,13 @@ async fn apply_group_changes(
let is_from_in_chat =
!chat_contacts.contains(&ContactId::SELF) || chat_contacts.contains(&from_id);
if mime_parser.get_header(HeaderDef::ChatVerified).is_some() {
if mime_parser.get_header(HeaderDef::ChatVerified).is_some() && !chat.is_protected() {
if let VerifiedEncryption::NotVerified(err) = verified_encryption {
if chat.is_protected() {
warn!(context, "Verification problem: {err:#}.");
let s = format!("{err}. See 'Info' for more details");
mime_parser.replace_msg_by_error(&s);
} else {
warn!(
context,
"Not marking chat {} as protected due to verification problem: {err:#}.",
chat.id
);
}
} else if !chat.is_protected() {
warn!(
context,
"Not marking chat {} as protected due to verification problem: {err:#}.", chat.id,
);
} else {
chat.id
.set_protection(
context,