mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Better recognition of complex messages

This commit is contained in:
M66B 2019-08-29 20:24:30 +02:00
parent 4a6805c2f1
commit 08e65f60ed
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@ -89,6 +89,11 @@ public class HtmlHelper {
Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory); Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
static String sanitize(Context context, String html, boolean show_images) { static String sanitize(Context context, String html, boolean show_images) {
if (html.length() > MAX_SIZE) {
Log.i("Message size=" + html.length());
return "<strong>" + context.getString(R.string.title_hint_too_complex) + "</strong>";
}
Document parsed = Jsoup.parse(html); Document parsed = Jsoup.parse(html);
// <html xmlns:v="urn:schemas-microsoft-com:vml" // <html xmlns:v="urn:schemas-microsoft-com:vml"
@ -126,10 +131,9 @@ public class HtmlHelper {
} }
} }
int size = parsed.text().length();
int links = parsed.select("a").size(); int links = parsed.select("a").size();
if (size > MAX_SIZE || links > MAX_LINKS) { if (links > MAX_LINKS) {
Log.i("Message size=" + size + " links=" + links); Log.i("Message links=" + links);
return "<strong>" + context.getString(R.string.title_hint_too_complex) + "</strong>"; return "<strong>" + context.getString(R.string.title_hint_too_complex) + "</strong>";
} }
@ -279,7 +283,7 @@ public class HtmlHelper {
@Override @Override
public void head(Node node, int depth) { public void head(Node node, int depth) {
if (node instanceof TextNode) { if (alinks < MAX_LINKS && node instanceof TextNode) {
TextNode tnode = (TextNode) node; TextNode tnode = (TextNode) node;
String text = tnode.text(); String text = tnode.text();
@ -305,7 +309,7 @@ public class HtmlHelper {
" " + matcher.start() + "..." + matcher.end() + "/" + text.length() + " " + matcher.start() + "..." + matcher.end() + "/" + text.length() +
" linked=" + linked + " email=" + email); " linked=" + linked + " email=" + email);
if (linked || alinks >= MAX_LINKS) if (linked)
span.appendText(text.substring(pos, matcher.end())); span.appendText(text.substring(pos, matcher.end()));
else { else {
span.appendText(text.substring(pos, matcher.start())); span.appendText(text.substring(pos, matcher.start()));
@ -319,7 +323,7 @@ public class HtmlHelper {
} }
pos = matcher.end(); pos = matcher.end();
} while (matcher.find()); } while (alinks < MAX_LINKS && matcher.find());
span.appendText(text.substring(pos)); span.appendText(text.substring(pos));