From e363bac1a3217506a6bd7c4ab0f2fed01ee16663 Mon Sep 17 00:00:00 2001
From: Sgn-32 <49990901+Sgn-32@users.noreply.github.com>
Date: Wed, 24 Nov 2021 14:09:05 +0100
Subject: [PATCH] Replace only the first emoji in message body.

---
 .../securesms/conversationlist/ConversationListItem.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
index fc24c6da62..7a26cdef5b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
@@ -571,13 +571,13 @@ public final class ConversationListItem extends ConstraintLayout
     final String bodyWithoutMediaPrefix;
 
     if (body.startsWith(EmojiStrings.GIF)) {
-      bodyWithoutMediaPrefix = body.replace(EmojiStrings.GIF, "");
+      bodyWithoutMediaPrefix = body.replaceFirst(EmojiStrings.GIF, "");
     } else if (body.startsWith(EmojiStrings.VIDEO)) {
-      bodyWithoutMediaPrefix = body.replace(EmojiStrings.VIDEO, "");
+      bodyWithoutMediaPrefix = body.replaceFirst(EmojiStrings.VIDEO, "");
     } else if (body.startsWith(EmojiStrings.PHOTO)) {
-      bodyWithoutMediaPrefix = body.replace(EmojiStrings.PHOTO, "");
+      bodyWithoutMediaPrefix = body.replaceFirst(EmojiStrings.PHOTO, "");
     } else if (thread.getExtra() != null && thread.getExtra().getStickerEmoji() != null && body.startsWith(thread.getExtra().getStickerEmoji())) {
-      bodyWithoutMediaPrefix = body.replace(thread.getExtra().getStickerEmoji(), "");
+      bodyWithoutMediaPrefix = body.replaceFirst(thread.getExtra().getStickerEmoji(), "");
     } else {
       return LiveDataUtil.just(body);
     }