From 5326111db15e24047807f2d95698c5fa800dd733 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 16 Dec 2017 22:17:01 +0100
Subject: initialize emoji helper in StartConversationActivity

---
 src/main/java/de/pixart/messenger/utils/EmojiWrapper.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/utils')

diff --git a/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java b/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java
index db2bf1242..d30c68a97 100644
--- a/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java
+++ b/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java
@@ -33,10 +33,13 @@ import android.support.text.emoji.EmojiCompat;
 public class EmojiWrapper {
 
     public static CharSequence transform(CharSequence input) {
-        final CharSequence charSequence;
-        if (EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED) {
-            return EmojiCompat.get().process(input);
-        } else {
+        try {
+            if (EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED) {
+                return EmojiCompat.get().process(input);
+            } else {
+                return input;
+            }
+        } catch (IllegalStateException e) {
             return input;
         }
     }
-- 
cgit v1.2.3