From 93d370146ecfcac74245c847c97c05fe017a82bd Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Wed, 13 Jul 2022 20:30:19 -0400 Subject: [PATCH] Revert "Fix url trailing symbol." This reverts commit 86227fbd67ad979a34e7af8e1f99b865fdb4edb9. --- .../conversation/ConversationItem.java | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 687975d079..069dcdc9b4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -149,8 +149,6 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import kotlin.Unit; import kotlin.jvm.functions.Function1; @@ -178,8 +176,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo private static final long MAX_CLUSTERING_TIME_DIFF = TimeUnit.MINUTES.toMillis(3); private static final int CONDENSED_MODE_MAX_LINES = 3; - private static final Pattern NOT_URL_PATTERN = Pattern.compile("[^a-zA-Z0-9-._~:/?#\\[\\]@!$&'()\\*+,;=]"); - private ConversationMessage conversationMessage; private MessageRecord messageRecord; private Optional nextMessageRecord; @@ -1477,26 +1473,12 @@ public final class ConversationItem extends RelativeLayout implements BindableCo boolean hasLinks = LinkifyCompat.addLinks(messageBody, shouldLinkifyAllLinks ? linkPattern : 0); if (hasLinks) { - URLSpan[] urlSpans = messageBody.getSpans(0, messageBody.length(), URLSpan.class); - - for (URLSpan urlSpan : urlSpans) { - int start = messageBody.getSpanStart(urlSpan); - int end = messageBody.getSpanEnd(urlSpan); - - Matcher matcher = NOT_URL_PATTERN.matcher(messageBody.toString().substring(end)); - if (matcher.find()) { - int newEnd = end + matcher.start(); - URLSpan newSpan = new URLSpan(messageBody.toString().substring(start, newEnd)); - messageBody.removeSpan(urlSpan); - messageBody.setSpan(newSpan, start, newEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - } - } - - Stream.of(urlSpans) + Stream.of(messageBody.getSpans(0, messageBody.length(), URLSpan.class)) .filterNot(url -> LinkUtil.isLegalUrl(url.getURL())) .forEach(messageBody::removeSpan); - urlSpans = messageBody.getSpans(0, messageBody.length(), URLSpan.class); + URLSpan[] urlSpans = messageBody.getSpans(0, messageBody.length(), URLSpan.class); + for (URLSpan urlSpan : urlSpans) { int start = messageBody.getSpanStart(urlSpan); int end = messageBody.getSpanEnd(urlSpan);