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/XmppActivity.java | |
| parent | 13407cb36d254b1fdb6e6f8d72391363881f3035 (diff) | |
modify emoji integration
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/XmppActivity.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/XmppActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index f5a1eac96..ed2a56a31 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -76,6 +76,7 @@ import de.pixart.messenger.entities.Message; import de.pixart.messenger.entities.Presences; import de.pixart.messenger.services.AvatarService; import de.pixart.messenger.services.BarcodeProvider; +import de.pixart.messenger.services.EmojiService; import de.pixart.messenger.services.UpdateService; import de.pixart.messenger.services.XmppConnectionService; import de.pixart.messenger.services.XmppConnectionService.XmppConnectionBinder; @@ -91,6 +92,8 @@ import de.pixart.messenger.xmpp.OnUpdateBlocklist; import pl.droidsonroids.gif.GifDrawable; import rocks.xmpp.addr.Jid; +import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS; + public abstract class XmppActivity extends ActionBarActivity { protected static final int REQUEST_ANNOUNCE_PGP = 0x0101; @@ -395,6 +398,7 @@ public abstract class XmppActivity extends ActionBarActivity { setVolumeControlStream(AudioManager.STREAM_NOTIFICATION); metrics = getResources().getDisplayMetrics(); ExceptionHelper.init(getApplicationContext()); + new EmojiService(this).init(getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji))); this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA); mColorRed = ContextCompat.getColor(this, R.color.red800); if (isDarkTheme()) { |