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

fix: trash only empty *text* parts when location.kml is attached

Browse Source 
If the message contains other attachment parts
such as images, they should not go into trash.
This commit is contained in:
link2xt
2023-09-27 09:27:09 +00:00
parent a7cf51868b
commit 6990312051
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/receive_imf.rs
View File

@@ -1128,7 +1128,8 @@ async fn add_parts(
(&part.msg, part.typ) (&part.msg, part.typ)
}; };
let part_is_empty = part.msg.is_empty() && part.param.get(Param::Quote).is_none(); let part_is_empty =
typ == Viewtype::Text && msg.is_empty() && part.param.get(Param::Quote).is_none();
let mime_modified = save_mime_modified && !part_is_empty; let mime_modified = save_mime_modified && !part_is_empty;
if mime_modified { if mime_modified {
// Avoid setting mime_modified for more than one part. // Avoid setting mime_modified for more than one part.
@@ -1153,7 +1154,8 @@ async fn add_parts(
// If you change which information is skipped if the message is trashed, // If you change which information is skipped if the message is trashed,
// also change `MsgId::trash()` and `delete_expired_messages()` // also change `MsgId::trash()` and `delete_expired_messages()`
let trash = chat_id.is_trash() || (is_location_kml && msg.is_empty()); let trash =
chat_id.is_trash() || (is_location_kml && msg.is_empty() && typ == Viewtype::Text);
let row_id = context let row_id = context
.sql .sql