diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-01-25 22:56:54 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-01-25 22:56:54 +0100 |
commit | d4a584c88a80ebf3f48bbe5ecb9860de3c59dbbb (patch) | |
tree | e59691eb30611828df4ef49db028f5eedbc27a26 /src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | |
parent | 13407cb36d254b1fdb6e6f8d72391363881f3035 (diff) |
modify emoji integration
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationsActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java index 7dca7d4c1..807fdf94d 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java @@ -418,7 +418,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio super.onCreate(savedInstanceState); ConversationMenuConfigurator.reloadFeatures(this); OmemoSetting.load(this); - new EmojiService(this).init(useBundledEmoji()); this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations); setSupportActionBar((Toolbar) binding.toolbar); configureActionBar(getSupportActionBar()); @@ -821,10 +820,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio } } - public boolean useBundledEmoji() { - return getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji)); - } - public void verifyOtrSessionDialog(final Conversation conversation, View view) { if (!conversation.hasValidOtrSession() || conversation.getOtrSession().getSessionStatus() != SessionStatus.ENCRYPTED) { Toast.makeText(this, R.string.otr_session_not_started, Toast.LENGTH_LONG).show(); |