add ability to use system emojis instead of integrated ones via expert settings

1 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/services/AbstractEmojiService.java b/src/main/java/de/pixart/messenger/services/AbstractEmojiService.java
index 75f1a4c98..ff10acf0c 100644
--- a/src/main/java/de/pixart/messenger/services/AbstractEmojiService.java
+++ b/src/main/java/de/pixart/messenger/services/AbstractEmojiService.java
@@ -2,6 +2,10 @@ package de.pixart.messenger.services;
 
 import android.content.Context;
 import android.support.text.emoji.EmojiCompat;
+import android.util.Log;
+
+import de.pixart.messenger.Config;
+import de.pixart.messenger.utils.Emoticons;
 
 public abstract class AbstractEmojiService {
 
@@ -13,9 +17,11 @@ public abstract class AbstractEmojiService {
 
     protected abstract EmojiCompat.Config buildConfig();
 
-    public void init() {
-        final EmojiCompat.Config config = buildConfig();
-        config.setReplaceAll(true);
+    public void init(boolean useBundledEmoji) {
+        Log.d(Config.LOGTAG, "Emojis: use integrated lib " + useBundledEmoji);
+        EmojiCompat.Config config = buildConfig();
+        config.setReplaceAll(useBundledEmoji);
+        EmojiCompat.reset(config);
         EmojiCompat.init(config);
     }
 }
\ No newline at end of file