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

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index b4968770a..ddda44cc8 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -88,6 +88,7 @@ import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
 import de.timroes.android.listview.EnhancedListView;
 
+import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
 import static de.pixart.messenger.ui.ShowFullscreenMessageActivity.getMimeType;
 
 public class ConversationActivity extends XmppActivity
@@ -210,7 +211,7 @@ public class ConversationActivity extends XmppActivity
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        new EmojiService(this).init();
+        new EmojiService(this).init(useBundledEmoji());
         if (savedInstanceState != null) {
             mOpenConversation = savedInstanceState.getString(STATE_OPEN_CONVERSATION, null);
             mPanelOpen = savedInstanceState.getBoolean(STATE_PANEL_OPEN, true);
@@ -2100,6 +2101,10 @@ public class ConversationActivity extends XmppActivity
         return getPreferences().getBoolean("use_white_background", getResources().getBoolean(R.bool.use_white_background));
     }
 
+    public boolean useBundledEmoji() {
+        return getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji));
+    }
+
     protected boolean trustKeysIfNeeded(int requestCode) {
         return trustKeysIfNeeded(requestCode, ATTACHMENT_CHOICE_INVALID);
     }