From bb39120ca64b6c39542350dc809635a5b4b5fecb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 28 Nov 2025 07:01:37 +0000 Subject: [PATCH 1/2] fix(deps): update dependency com.vanniktech:emoji-google to v0.23.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 76bd773a1af..7e475f378b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -205,7 +205,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'com.google.android.material:material:1.13.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.1' - implementation "com.vanniktech:emoji-google:0.21.0" + implementation "com.vanniktech:emoji-google:0.23.0" implementation "androidx.emoji2:emoji2:${emojiVersion}" implementation "androidx.emoji2:emoji2-bundled:${emojiVersion}" implementation "androidx.emoji2:emoji2-views:${emojiVersion}" From 3b87e023e9af6ffd21c0414e72fb253eb6071ed4 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 28 Nov 2025 11:34:39 +0100 Subject: [PATCH 2/2] fix(emoji): Update to latest API Signed-off-by: Andy Scherzinger --- .../main/java/com/nextcloud/talk/utils/TextMatchers.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java b/app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java index 58aabdb7e50..88906a1ecf3 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java +++ b/app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java @@ -17,7 +17,11 @@ public final class TextMatchers { public static boolean isMessageWithSingleEmoticonOnly(@Nullable final String text) { - final EmojiInformation emojiInformation = Emojis.emojiInformation(text); - return (emojiInformation.isOnlyEmojis && emojiInformation.emojis.size() == 1); + if (text != null) { + final EmojiInformation emojiInformation = Emojis.emojiInformation(text); + return (emojiInformation.isOnlyEmojis && emojiInformation.getEmojiCount() == 1); + } else { + return false; + } } }