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

avoid addrparse to panic() and refactor according code a little with test.

Browse Source
This commit is contained in:
holger krekel
2019-12-15 18:27:38 +01:00
parent 4bacae3711
commit 09c7ab1ee6
2 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dc_receive_imf.rs
View File

@@ -171,7 +171,7 @@ pub fn dc_receive_imf(
}
}
};
if mime_parser.get_last_nonmeta().is_some() {
if mime_parser.parts.last().is_some() {
if let Err(err) = add_parts(
context,
&mut mime_parser,
@@ -198,7 +198,7 @@ pub fn dc_receive_imf(
bail!("add_parts error: {:?}", err);
}
} else {
// there are no non-meta data in message, do some basic calculations so that the varaiables
// there are parts in this message, do some basic calculations so that the variables
// are correct in the further processing
if sent_timestamp > time() {
sent_timestamp = time()
@@ -588,10 +588,6 @@ fn add_parts(
let subject = mime_parser.get_subject().unwrap_or_default();
for part in mime_parser.parts.iter_mut() {
if part.is_meta {
continue;
}
if mime_parser.location_kml.is_some()
&& icnt == 1
&& (part.msg == "-location-" || part.msg.is_empty())