Fix incorrect emoji display in messages and reactions. #14362
+2
−1
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Emoji variations were incrementing the sprite index incorrectly, causing wrong emojis to display when mixed with text or used as reactions.
First time contributor checklist
Contributor checklist
Fixes #14361
syntaxDescription
Problem:
Emoji variations (such as skin tone modifiers) were incorrectly incrementing the sprite sheet index for each variation. This caused wrong emojis to display when mixed with text or used as reactions.
Root Cause:
The sprite sheet contains only one image per base emoji, but the code in
EmojiSource.kt
was creating separate indices for each variation (default + skin tones), causing an index mismatch between the emoji tree and sprite positions.Solution:
Modified the emoji tree building logic to capture the index once per emoji and share it across all variations, ensuring all variations reference the same sprite sheet position.
Testing:
Changes:
app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
(2 lines changed)Fixes #14361