From 1b3286ecfdc9926a7eb334e66ad2154783d76aa8 Mon Sep 17 00:00:00 2001
From: Sanyam Suyal <168440633+SanyamSuyal@users.noreply.github.com>
Date: Sun, 5 Oct 2025 14:46:03 +0000
Subject: [PATCH] Fix incorrect emoji display in messages and reactions.

Emoji variations were incrementing the sprite index incorrectly, causing wrong emojis to display when mixed with text or used as reactions.
---
 .../main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
index 348cf502449..4a1b6388816 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
@@ -66,9 +66,10 @@ class EmojiSource(
 
         var overallIndex = 0
         page.displayEmoji.forEach { emoji: Emoji ->
+          val emojiIndex = overallIndex++
           emoji.variations.forEachIndexed { variationIndex, variation ->
             val raw = emoji.getRawVariation(variationIndex)
-            tree.add(variation, EmojiDrawInfo(emojiPage, overallIndex++, variation, raw, jumboPages[raw]))
+            tree.add(variation, EmojiDrawInfo(emojiPage, emojiIndex, variation, raw, jumboPages[raw]))
           }
         }
       }