aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-12-16 22:17:01 +0100
committerChristian Schneppe <christian@pix-art.de>2017-12-16 22:17:01 +0100
commit5326111db15e24047807f2d95698c5fa800dd733 (patch)
tree369fe6c6c63c974439779e719c89adb2866d534b /src/main/java/de/pixart/messenger/utils/EmojiWrapper.java
parente87c2b325bc372536f0c29bc72660143272d8086 (diff)
initialize emoji helper in StartConversationActivity
Diffstat (limited to 'src/main/java/de/pixart/messenger/utils/EmojiWrapper.java')
-rw-r--r--src/main/java/de/pixart/messenger/utils/EmojiWrapper.java11
1 files changed, 7 insertions, 4 deletions
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;
}
}