From 34e8d5ac5723ea64541a03c90639eaa11537a8cc Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 15 Jul 2019 16:02:51 -0400 Subject: [PATCH] Ignore whitespace when determining if we show jumbomoji. --- .../securesms/components/emoji/parsing/EmojiParser.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java index b582d7afe1..91450e102b 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java +++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java @@ -42,7 +42,9 @@ public class EmojiParser { public @NonNull CandidateList findCandidates(@Nullable CharSequence text) { List results = new LinkedList<>(); - if (text == null) return new CandidateList(results, false); + if (text == null) { + return new CandidateList(results, false); + } boolean allEmojis = text.length() > 0; @@ -61,11 +63,13 @@ public class EmojiParser { results.add(new Candidate(i, emojiEnd, drawInfo)); i = emojiEnd - 1; - } else { + } else if (text.charAt(i) != ' '){ allEmojis = false; } } + allEmojis &= !results.isEmpty(); + return new CandidateList(results, allEmojis); }