From 6605001e40c0ef2567acb8cf09730bc2cd1a6140 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 14 Jun 2024 21:48:56 -0500
Subject: [PATCH] We only need to extend to consume variant selector

Surprise, surprise
---
 .../java/eu/siacs/conversations/ui/adapter/MessageAdapter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 524366b311207464f09870b840c8e4422dff7504..9ae71f7a849ad484ac2daa3f8ab8d4ae4ab0876e 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -713,7 +713,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
             for (final var emoji : EmojiManager.extractEmojisInOrderWithIndex(body.toString())) {
                 var end = emoji.getCharIndex() + emoji.getEmoji().getEmoji().length();
-                if (body.length() > end) end++; // This fixes double-showing for skin tone emoji
+                if (body.length() > end && body.charAt(end) == '\uFE0F') end++;
                 body.setSpan(
                         new RelativeSizeSpan(1.2f),
                         emoji.getCharIndex(),