From 0464a6a3fad6b6976fa924ae4307a5bf93e563c8 Mon Sep 17 00:00:00 2001
From: Tristan Zur <tristan.zur@ccwn.org>
Date: Sat, 10 Jan 2015 22:17:51 +0100
Subject: Fixed missing symbol for eu.siacs.conversations.Config and wrong
 parameter for method eu.siacs.conversations.utils.UIHelper.transformAscii..

---
 .../java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java    | 3 ++-
 src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java    | 3 ++-
 2 files changed, 4 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 32f95431..a44851e3 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -2,6 +2,7 @@ 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,7 +140,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			if ((message.getEncryption() != Message.ENCRYPTION_PGP)
 					&& (message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) {
 				mLastMessage.setText(Config.PARSE_EMOTICONS ? UIHelper
-						.transformAsciiEmoticons(message.getBody()) : message
+						.transformAsciiEmoticons(getContext(), message.getBody()) : message
 						.getBody());
 			} else {
 				mLastMessage.setText(R.string.encrypted_message_received);
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 83b4e41b..249edecd 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -23,6 +23,7 @@ import android.widget.Toast;
 
 import java.util.List;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
@@ -225,7 +226,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		if (message.getBody() != null) {
 			if (message.getType() != Message.TYPE_PRIVATE) {
 				viewHolder.messageBody.setText(Config.PARSE_EMOTICONS ? UIHelper
-						.transformAsciiEmoticons(message.getMergedBody())
+						.transformAsciiEmoticons(getContext(), message.getMergedBody())
 						: message.getMergedBody());
 			} else {
 				String privateMarker;
-- 
cgit v1.2.3