From ddaf094a446e5c351b545fdf0b433eacf7dfb67a Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 17 Apr 2021 16:38:07 -0400 Subject: [PATCH] fix issue with markdown links --- src/org/thoughtcrime/securesms/ConversationItem.java | 6 ++++-- .../securesms/components/emoji/EmojiTextView.java | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index aa425680e..45a7d77d6 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -394,11 +394,13 @@ public class ConversationItem extends LinearLayout bodyText.setVisibility(View.GONE); } else { - Spannable spannable = (Spannable)markwon.toMarkdown(text); if (batchSelected.isEmpty()) { + Spannable spannable = (Spannable)markwon.toMarkdown(text); spannable = EmojiTextView.linkify(spannable); + bodyText.setText(spannable); + } else { + bodyText.setText(text); } - bodyText.setText(spannable); bodyText.setVisibility(View.VISIBLE); } diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java index 68869ed6d..2921226f1 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java @@ -227,9 +227,8 @@ public class EmojiTextView extends AppCompatTextView { public static Spannable linkify(Spannable messageBody) { // linkify commands such as `/echo` - // do this first to avoid `/xkcd_123456` to be treated partly as a phone number - if (Linkify.addLinks(messageBody, CMD_PATTERN, "cmd:", null, null)) { - EmojiTextView.replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call - } + Linkify.addLinks(messageBody, CMD_PATTERN, "cmd:", null, null); + EmojiTextView.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)) {