From aa4b65dbb0b42ed948ae899b039000452a1878c2 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 18 Nov 2025 05:30:09 +0100 Subject: [PATCH 1/4] customize phone number regex in Linkifier --- .../org/thoughtcrime/securesms/util/Linkifier.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java b/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java index da5587643..f94bb475e 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java @@ -4,6 +4,7 @@ import android.text.SpannableString; import android.text.Spanned; import android.text.style.URLSpan; import android.text.util.Linkify; +import android.util.Patterns; import java.util.regex.Pattern; @@ -11,6 +12,13 @@ import java.util.regex.Pattern; public class Linkifier { private static final Pattern CMD_PATTERN = Pattern.compile("(?<=^|\\s)/[a-zA-Z][a-zA-Z@\\d_/.-]{0,254}"); private static final Pattern PROXY_PATTERN = Pattern.compile("(?<=^|\\s)(SOCKS5|socks5|ss|SS):[^ \\n]+"); + private static final Pattern PHONE_PATTERN + = Pattern.compile( // sdd = space, dot, or dash + "(?* + + "(\\([0-9]+\\)[\\- \\.]*)?" // ()* + + "([0-9][0-9\\- \\.]{3,}[0-9])" // + (5 characters min) + + "(?![a-zA-Z0-9])"); // no letter at end private static void replaceURLSpan(SpannableString messageBody) { URLSpan[] urlSpans = messageBody.getSpans(0, messageBody.length(), URLSpan.class); @@ -33,8 +41,12 @@ public class Linkifier { replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call } + if (Linkify.addLinks(messageBody, PHONE_PATTERN, "tel:", (s, start, end) -> s.subSequence(start, end).toString().replaceAll("[\\- \\.]", "").length() >= 5, null)) { + replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call + } + // linkyfiy urls etc., this removes all existing URLSpan - if (Linkify.addLinks(messageBody, Linkify.EMAIL_ADDRESSES|Linkify.WEB_URLS|Linkify.PHONE_NUMBERS)) { + if (Linkify.addLinks(messageBody, Linkify.EMAIL_ADDRESSES|Linkify.WEB_URLS)) { replaceURLSpan(messageBody); } From 488ba08e053e252bf0aafb9b3cd25d0852cf1991 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 18 Nov 2025 22:02:34 +0100 Subject: [PATCH 2/4] use Linkify.sPhoneNumberMatchFilter --- src/main/java/org/thoughtcrime/securesms/util/Linkifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java b/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java index f94bb475e..0a82753b0 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java @@ -41,7 +41,7 @@ public class Linkifier { replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call } - if (Linkify.addLinks(messageBody, PHONE_PATTERN, "tel:", (s, start, end) -> s.subSequence(start, end).toString().replaceAll("[\\- \\.]", "").length() >= 5, null)) { + if (Linkify.addLinks(messageBody, PHONE_PATTERN, "tel:", Linkify.sPhoneNumberMatchFilter, Linkify.sPhoneNumberTransformFilter)) { replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call } From 57ac9d6b916ff55298fb185d83cd57a2a81483a5 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 21 Nov 2025 03:11:30 +0100 Subject: [PATCH 3/4] don't linkify numbers in the middle of text --- .../securesms/util/Linkifier.java | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java b/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java index 0a82753b0..a223deef8 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java @@ -4,7 +4,6 @@ import android.text.SpannableString; import android.text.Spanned; import android.text.style.URLSpan; import android.text.util.Linkify; -import android.util.Patterns; import java.util.regex.Pattern; @@ -14,11 +13,24 @@ public class Linkifier { private static final Pattern PROXY_PATTERN = Pattern.compile("(?<=^|\\s)(SOCKS5|socks5|ss|SS):[^ \\n]+"); private static final Pattern PHONE_PATTERN = Pattern.compile( // sdd = space, dot, or dash - "(?* + "(\\([0-9]+\\)[\\- \\.]*)?" // ()* + "([0-9][0-9\\- \\.]{3,}[0-9])" // + (5 characters min) - + "(?![a-zA-Z0-9])"); // no letter at end + + "(?=$|\\s|\\.|\\))"); // no letter at end + + private static int internalPhoneLinkifier = -1; + + private static boolean internalPhoneLinkifierNeeded() { + if (internalPhoneLinkifier == -1) { + if(Linkify.addLinks(new SpannableString("a100b"), Linkify.PHONE_NUMBERS)) { + internalPhoneLinkifier = 1; + } else { + internalPhoneLinkifier = 0; + } + } + return internalPhoneLinkifier == 1; + } private static void replaceURLSpan(SpannableString messageBody) { URLSpan[] urlSpans = messageBody.getSpans(0, messageBody.length(), URLSpan.class); @@ -41,12 +53,18 @@ public class Linkifier { replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call } - if (Linkify.addLinks(messageBody, PHONE_PATTERN, "tel:", Linkify.sPhoneNumberMatchFilter, Linkify.sPhoneNumberTransformFilter)) { - replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call + int flags; + if (internalPhoneLinkifierNeeded()) { + if (Linkify.addLinks(messageBody, PHONE_PATTERN, "tel:", Linkify.sPhoneNumberMatchFilter, Linkify.sPhoneNumberTransformFilter)) { + replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call + } + flags = Linkify.EMAIL_ADDRESSES|Linkify.WEB_URLS; + } else { + flags = Linkify.EMAIL_ADDRESSES|Linkify.WEB_URLS|Linkify.PHONE_NUMBERS; } // linkyfiy urls etc., this removes all existing URLSpan - if (Linkify.addLinks(messageBody, Linkify.EMAIL_ADDRESSES|Linkify.WEB_URLS)) { + if (Linkify.addLinks(messageBody, flags)) { replaceURLSpan(messageBody); } From 4950d0be556a214198a3a136fb5df87e94947b2c Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 21 Nov 2025 03:33:09 +0100 Subject: [PATCH 4/4] tweak variable name --- .../org/thoughtcrime/securesms/util/Linkifier.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java b/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java index a223deef8..4f5cd4e8b 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Linkifier.java @@ -19,17 +19,17 @@ public class Linkifier { + "([0-9][0-9\\- \\.]{3,}[0-9])" // + (5 characters min) + "(?=$|\\s|\\.|\\))"); // no letter at end - private static int internalPhoneLinkifier = -1; + private static int brokenPhoneLinkifier = -1; private static boolean internalPhoneLinkifierNeeded() { - if (internalPhoneLinkifier == -1) { + if (brokenPhoneLinkifier == -1) { // unset if(Linkify.addLinks(new SpannableString("a100b"), Linkify.PHONE_NUMBERS)) { - internalPhoneLinkifier = 1; + brokenPhoneLinkifier = 1; // true } else { - internalPhoneLinkifier = 0; + brokenPhoneLinkifier = 0; // false } } - return internalPhoneLinkifier == 1; + return brokenPhoneLinkifier == 1; } private static void replaceURLSpan(SpannableString messageBody) {