diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-03-31 14:13:12 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-03-31 14:13:12 +0200 |
commit | 52ed924a1333448505e83204d3d9b248b2356004 (patch) | |
tree | 29412905e54da231589a1a553808ee4e9934b7db /src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | |
parent | 75c5275f7e9a27019b9517770603ca4c77f1fbd9 (diff) |
Changes for emoticon parser reactivated
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 | 4 |
1 files changed, 3 insertions, 1 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 c4a446e8..fac4cc91 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -120,7 +120,9 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { Pair<String,Boolean> preview = UIHelper.getMessagePreview(activity,message); mLastMessage.setVisibility(View.VISIBLE); imagePreview.setVisibility(View.GONE); - mLastMessage.setText(preview.first); + boolean parseEmoticons = Settings.PARSE_EMOTICONS; + CharSequence msgText = parseEmoticons ? UIHelper.transformAsciiEmoticons(getContext(), preview.first) : preview.first; + mLastMessage.setText(msgText); if (preview.second) { if (conversation.isRead()) { mLastMessage.setTypeface(null, Typeface.ITALIC); |