From 57bbad6fab137a0c3a4472b1fe95f56120f9ee02 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 11 Oct 2019 12:02:02 +1100 Subject: [PATCH] Debug --- .../securesms/conversation/ConversationItem.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java index f7fb267f7d..1f3216bdad 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -475,8 +475,8 @@ public class ConversationItem extends LinearLayout if (isCaptionlessMms(messageRecord)) { bodyText.setVisibility(View.GONE); - } else { - Spannable text = linkifyMessageBody(highlightMentions(messageRecord.getDisplayBody(context), isGroupThread), batchSelected.isEmpty()); + } else { ; + Spannable text = highlightMentions(linkifyMessageBody(messageRecord.getDisplayBody(context), batchSelected.isEmpty()), isGroupThread); text = SearchUtil.getHighlightedSpan(locale, () -> new BackgroundColorSpan(Color.YELLOW), text, searchQuery); text = SearchUtil.getHighlightedSpan(locale, () -> new ForegroundColorSpan(Color.BLACK), text, searchQuery); @@ -783,9 +783,9 @@ public class ConversationItem extends LinearLayout int startIndex = 0; if (matcher.find(startIndex) && isGroupThread) { while (true) { - CharSequence userID = text.subSequence(matcher.start() + 1, matcher.end()); // +1 to get rid of the @ + String userID = text.subSequence(matcher.start() + 1, matcher.end()).toString(); // +1 to get rid of the @ String userDisplayName; - if (userID.equals(TextSecurePreferences.getLocalNumber(context))) { + if (userID.toLowerCase().equals(TextSecurePreferences.getLocalNumber(context).toLowerCase())) { userDisplayName = TextSecurePreferences.getProfileName(context); } else { String publicChatID = LokiGroupChatAPI.getPublicChatServer() + "." + LokiGroupChatAPI.getPublicChatServerID();