From d5eca31bc3c8f834b86e3ebd55e93ba740356aaf Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 4 Jun 2019 17:43:51 +0200 Subject: [PATCH] Skip recognized domain names before 'at' sign --- app/src/main/java/eu/faircode/email/HtmlHelper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index e5c948e040..64539914b6 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -237,13 +237,15 @@ public class HtmlHelper { parent = parent.parent(); } + boolean atStart = (matcher.start() > 0 && text.charAt(matcher.start() - 1) == '@'); + boolean atEnd = (matcher.end() < text.length() && text.charAt(matcher.end()) == '@'); + if (BuildConfig.DEBUG) Log.i("Web url=" + matcher.group() + - " " + matcher.start() + "..." + matcher.end() + - " linked=" + linked); + " " + matcher.start() + "..." + matcher.end() + "/" + text.length() + + " linked=" + linked + " start=" + atStart + " end=" + atEnd); - if (linked || - (matcher.start() > 0 && text.charAt(matcher.start() - 1) == '@')) + if (linked || atStart || atEnd) span.appendText(text.substring(pos, matcher.end())); else { span.appendText(text.substring(pos, matcher.start()));