aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-12-16 23:15:58 +0100
committerChristian Schneppe <christian@pix-art.de>2017-12-16 23:15:58 +0100
commit20f15c02a630d7abb6935418136bd5c6ab109231 (patch)
tree29b38245588320997128bf3c28913b48d8bf8c10 /src
parentbe337e0a8e0223d56a20052136b1e774f366b22c (diff)
fix init EmojiService in StartConversationActivity
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 545be67d1..23bdc056b 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -79,6 +79,8 @@ import de.pixart.messenger.xmpp.XmppConnection;
import de.pixart.messenger.xmpp.jid.InvalidJidException;
import de.pixart.messenger.xmpp.jid.Jid;
+import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
+
public class StartConversationActivity extends XmppActivity implements OnRosterUpdate, OnUpdateBlocklist {
private final int REQUEST_SYNC_CONTACTS = 0x3b28cf;
@@ -270,7 +272,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- new EmojiService(this).init();
+ new EmojiService(this).init(useBundledEmoji());
setContentView(R.layout.activity_start_conversation);
mViewPager = findViewById(R.id.start_conversation_view_pager);
ActionBar actionBar = getActionBar();
@@ -1190,4 +1192,8 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
return false;
}
}
+
+ public boolean useBundledEmoji() {
+ return getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji));
+ }
}