From 78370094e9c9c2f58cb5f969217db555f9a283c2 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 9 Dec 2014 14:21:35 +0100 Subject: cleanup: removed unused emoticon parsing --- .../java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java') 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 b81544e64..f728e800f 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -2,7 +2,6 @@ package eu.siacs.conversations.ui.adapter; import java.util.List; -import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Downloadable; @@ -139,10 +138,7 @@ public class ConversationAdapter extends ArrayAdapter { } else { if ((message.getEncryption() != Message.ENCRYPTION_PGP) && (message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) { - String body = Config.PARSE_EMOTICONS ? UIHelper - .transformAsciiEmoticons(message.getBody()) : message - .getBody(); - mLastMessage.setText(body); + mLastMessage.setText(message.getBody()); } else { mLastMessage.setText(R.string.encrypted_message_received); } -- cgit v1.2.3