refactor(simplify): move dehtml dependency to mimeparser

This change also removes unnecessary String clone for HTML messages.
This commit is contained in:
Alexander Krotov
2019-12-20 03:25:03 +03:00
committed by holger krekel
parent 7f6a1ad1a7
commit fe4080d59f
3 changed files with 52 additions and 49 deletions

View File

@@ -12,6 +12,7 @@ use crate::contact::*;
use crate::context::Context;
use crate::dc_simplify::*;
use crate::dc_tools::*;
use crate::dehtml::dehtml;
use crate::e2ee;
use crate::error::Result;
use crate::events::Event;
@@ -580,7 +581,12 @@ impl<'a> MimeParser<'a> {
("".into(), false)
} else {
let is_html = mime_type == mime::TEXT_HTML;
simplify(&decoded_data, is_html, self.has_chat_version())
let out = if is_html {
dehtml(&decoded_data)
} else {
decoded_data.clone()
};
simplify(out, self.has_chat_version())
};
if !simplified_txt.is_empty() {