aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-01-25 22:56:54 +0100
committerChristian Schneppe <christian@pix-art.de>2019-01-25 22:56:54 +0100
commitd4a584c88a80ebf3f48bbe5ecb9860de3c59dbbb (patch)
treee59691eb30611828df4ef49db028f5eedbc27a26 /src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
parent13407cb36d254b1fdb6e6f8d72391363881f3035 (diff)
modify emoji integration
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/StartConversationActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 825494d90..9900c7b9b 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -261,7 +261,6 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- new EmojiService(this).init(useBundledEmoji());
this.binding = DataBindingUtil.setContentView(this, R.layout.activity_start_conversation);
Toolbar toolbar = (Toolbar) binding.toolbar;
setSupportActionBar(toolbar);
@@ -939,10 +938,6 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
finish();
}
- public boolean useBundledEmoji() {
- return getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji));
- }
-
@Override
public void onCreateDialogPositiveClick(Spinner spinner, String name) {
if (!xmppConnectionServiceBound) {