diff options
| author | lookshe <github@lookshe.org> | 2015-08-16 17:30:06 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-08-16 17:30:06 +0200 |
| commit | ea1debd8f72903bfbcc631713d803c27be433f20 (patch) | |
| tree | f1846b8b9f450cda92e7baa6c6a2d233225998b6 /src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | |
| parent | b67060989302daf9850e84e2d4d4320e99bdfb83 (diff) | |
Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index c42dd305..7443c0cb 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -119,8 +119,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { Pair<String,Boolean> preview = UIHelper.getMessagePreview(activity,message); mLastMessage.setVisibility(View.VISIBLE); imagePreview.setVisibility(View.GONE); - boolean parseEmoticons = Settings.PARSE_EMOTICONS; - CharSequence msgText = parseEmoticons ? UIHelper.transformAsciiEmoticons(getContext(), preview.first) : preview.first; + CharSequence msgText = preview.first; mLastMessage.setText(msgText); if (preview.second) { if (conversation.isRead()) { |