diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-11-29 21:50:33 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-11-29 21:50:33 +0100 |
commit | b6052c82cb8463ee465226949953a7187f4096e4 (patch) | |
tree | 6347fb72ddb1928bfcaafbe914b9de795b76d633 /src/main/java/de/pixart/messenger/ui/ShareWithActivity.java | |
parent | d03129f1301942ddc9808229c158b92f492e79f1 (diff) |
add ability to use system emojis instead of integrated ones via expert settings
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ShareWithActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShareWithActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java index 161a5c366..6de7acd06 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java @@ -33,6 +33,7 @@ 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; import static java.lang.String.format; public class ShareWithActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate { @@ -173,7 +174,8 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - new EmojiService(this).init(); + boolean useBundledEmoji = getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji)); + new EmojiService(this).init(useBundledEmoji); if (getActionBar() != null) { getActionBar().setDisplayHomeAsUpEnabled(false); getActionBar().setHomeButtonEnabled(false); |