From 50e88b3f86fad0658c2b8791b6b84abc087b0759 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 21 Aug 2023 17:17:27 +0200 Subject: [PATCH] Fix not clickable tags for some languages --- .../android/mastodon/helper/SpannableHelper.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java index 25c118ed..78ea913d 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java @@ -210,14 +210,9 @@ public class SpannableHelper { for (MarkdownConverter.MarkdownItem markdownItem : markdownConverter.markdownItems) { - String sb = Pattern.compile("\\A[A-Za-z0-9_]").matcher(markdownItem.code).find() ? "\\b" : ""; - String eb = Pattern.compile("[A-Za-z0-9_]\\z").matcher(markdownItem.code).find() ? "\\b" : "\\B"; - Pattern p; - if (!isRTL(initialContent.toString())) { - p = Pattern.compile(sb + "(" + Pattern.quote(markdownItem.code) + ")" + eb, Pattern.UNICODE_CASE); - } else { - p = Pattern.compile(eb + "(" + Pattern.quote(markdownItem.code) + ")" + sb, Pattern.UNICODE_CASE); - } + String sb = Pattern.compile("\\A[\\p{L}0-9_]").matcher(markdownItem.code).find() ? "\\b" : ""; + String eb = Pattern.compile("[\\p{L}0-9_]\\z").matcher(markdownItem.code).find() ? "\\b" : "\\B"; + Pattern p = Pattern.compile(sb + "(" + Pattern.quote(markdownItem.code) + ")" + eb, Pattern.UNICODE_CASE); Matcher m = p.matcher(content); int fetchPosition = 1; while (m.find()) {