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

remove last ok_to_continue in mimeparser

Browse Source
This commit is contained in:
holger krekel
2019-10-06 01:41:02 +02:00
parent 46a71e81a0
commit 22b4d1734c
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dc_mimeparser.rs
View File

@@ -606,7 +606,6 @@ impl<'a> MimeParser<'a> {
let old_part_count = self.parts.len(); let old_part_count = self.parts.len();
/* regard `Content-Transfer-Encoding:` */ /* regard `Content-Transfer-Encoding:` */
let mut ok_to_continue = true;
let mut desired_filename = String::default(); let mut desired_filename = String::default();
let mut simplifier: Option<Simplify> = None; let mut simplifier: Option<Simplify> = None;
match mime_type { match mime_type {
@@ -626,10 +625,9 @@ impl<'a> MimeParser<'a> {
let (res, _, _) = encoding.decode(&decoded_data); let (res, _, _) = encoding.decode(&decoded_data);
if res.is_empty() { if res.is_empty() {
/* no error - but nothing to add */ /* no error - but nothing to add */
ok_to_continue = false; return false;
} else {
decoded_data = res.as_bytes().to_vec()
} }
decoded_data = res.as_bytes().to_vec()
} else { } else {
warn!( warn!(
self.context, self.context,
@@ -639,7 +637,6 @@ impl<'a> MimeParser<'a> {
); );
} }
} }
if ok_to_continue {
/* 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();
@@ -664,7 +661,6 @@ impl<'a> MimeParser<'a> {
if simplifier.unwrap().is_forwarded { if simplifier.unwrap().is_forwarded {
self.is_forwarded = true; self.is_forwarded = true;
} }
}
} }
DC_MIMETYPE_IMAGE DC_MIMETYPE_IMAGE
| DC_MIMETYPE_AUDIO | DC_MIMETYPE_AUDIO
@@ -738,10 +734,9 @@ impl<'a> MimeParser<'a> {
desired_filename = desired_filename =
format!("file.{}", as_str((*(*mime).mm_content_type).ct_subtype)); format!("file.{}", as_str((*(*mime).mm_content_type).ct_subtype));
} else { } else {
ok_to_continue = false; return false;
} }
} }
if ok_to_continue {
if desired_filename.starts_with("location") if desired_filename.starts_with("location")
&& desired_filename.ends_with(".kml") && desired_filename.ends_with(".kml")
{ {
@@ -765,7 +760,6 @@ impl<'a> MimeParser<'a> {
&desired_filename, &desired_filename,
); );
} }
}
} }
_ => {} _ => {}
} }