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/MessageAdapter.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/MessageAdapter.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 9699f7d4..b6979cc6 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -252,10 +252,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); viewHolder.messageBody.setText(span); } else { - boolean parseEmoticons = Settings.PARSE_EMOTICONS; - viewHolder.messageBody.setText(parseEmoticons ? UIHelper - .transformAsciiEmoticons(getContext(), message.getMergedBody()) - : formattedBody); + viewHolder.messageBody.setText(formattedBody); } } else { String privateMarker; |