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

simplify calling Simplifier, get is_forwarded flag correctly

Browse Source
This commit is contained in:
B. Petersen
2019-10-16 22:53:59 +02:00
committed by Floris Bruynooghe
parent 4f126c5292
commit d16bdafaf0
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dc_mimeparser.rs
View File

@@ -607,12 +607,8 @@ impl<'a> MimeParser<'a> {
/* regard `Content-Transfer-Encoding:` */ /* regard `Content-Transfer-Encoding:` */
let mut desired_filename = String::default(); let mut desired_filename = String::default();
let mut simplifier: Option<Simplify> = None;
match mime_type { match mime_type {
DC_MIMETYPE_TEXT_PLAIN | DC_MIMETYPE_TEXT_HTML => { DC_MIMETYPE_TEXT_PLAIN | DC_MIMETYPE_TEXT_HTML => {
if simplifier.is_none() {
simplifier = Some(Simplify::new());
}
/* get from `Content-Type: text/...; charset=utf-8`; must not be free()'d */ /* get from `Content-Type: text/...; charset=utf-8`; must not be free()'d */
let charset = mailmime_content_charset_get((*mime).mm_content_type); let charset = mailmime_content_charset_get((*mime).mm_content_type);
if !charset.is_null() if !charset.is_null()
@@ -640,13 +636,14 @@ impl<'a> MimeParser<'a> {
/* check header directly as is_send_by_messenger is not yet set up */ /* check header directly as is_send_by_messenger is not yet set up */
let is_msgrmsg = self.lookup_optional_field("Chat-Version").is_some(); let is_msgrmsg = self.lookup_optional_field("Chat-Version").is_some();
let mut simplifier = Simplify::new();
let simplified_txt = if decoded_data.is_empty() { let simplified_txt = if decoded_data.is_empty() {
"".into() "".into()
} else { } else {
let input = std::string::String::from_utf8_lossy(&decoded_data); let input = std::string::String::from_utf8_lossy(&decoded_data);
let is_html = mime_type == 70; let is_html = mime_type == 70;
simplifier.unwrap().simplify(&input, is_html, is_msgrmsg) simplifier.simplify(&input, is_html, is_msgrmsg)
}; };
if !simplified_txt.is_empty() { if !simplified_txt.is_empty() {
let mut part = Part::default(); let mut part = Part::default();
@@ -658,7 +655,7 @@ impl<'a> MimeParser<'a> {
self.do_add_single_part(part); self.do_add_single_part(part);
} }
if simplifier.unwrap().is_forwarded { if simplifier.is_forwarded {
self.is_forwarded = true; self.is_forwarded = true;
} }
} }