We only need to extend to consume variant selector

Stephen Paul Weber created

Surprise, surprise

Change summary

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

Detailed changes

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(),