use com.android.support:support-emoji

3 files changed, 39 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/services/AbstractEmojiService.java b/src/main/java/de/pixart/messenger/services/AbstractEmojiService.java
new file mode 100644
index 000000000..75f1a4c98
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/services/AbstractEmojiService.java
@@ -0,0 +1,21 @@
+package de.pixart.messenger.services;
+
+import android.content.Context;
+import android.support.text.emoji.EmojiCompat;
+
+public abstract class AbstractEmojiService {
+
+    protected final Context context;
+
+    public AbstractEmojiService(Context context) {
+        this.context = context;
+    }
+
+    protected abstract EmojiCompat.Config buildConfig();
+
+    public void init() {
+        final EmojiCompat.Config config = buildConfig();
+        config.setReplaceAll(true);
+        EmojiCompat.init(config);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/services/EmojiService.java b/src/main/java/de/pixart/messenger/services/EmojiService.java
new file mode 100644
index 000000000..6f8d8facd
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/services/EmojiService.java
@@ -0,0 +1,17 @@
+package de.pixart.messenger.services;
+
+import android.content.Context;
+import android.support.text.emoji.EmojiCompat;
+import android.support.text.emoji.bundled.BundledEmojiCompatConfig;
+
+public class EmojiService extends AbstractEmojiService {
+
+    public EmojiService(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected EmojiCompat.Config buildConfig() {
+        return new BundledEmojiCompatConfig(context);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index f7416bca6..9f78fa751 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -510,7 +510,7 @@ public class NotificationService {
         for (Message message : messages) {
             Pair<String, Boolean> preview = UIHelper.getMessagePreview(mXmppConnectionService, message);
             // only show user written text
-            if (preview.second == false) {
+            if (!preview.second) {
                 uBuilder.addMessage(preview.first);
                 uBuilder.setLatestTimestamp(message.getTimeSent());
             }