From ea1debd8f72903bfbcc631713d803c27be433f20 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 16 Aug 2015 17:30:06 +0200
Subject: Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon
 module

---
 src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java')

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;
-- 
cgit v1.2.3