From 48717dd7d37c066ab626fc626a2ced626ef21d42 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sat, 3 Jan 2015 21:31:56 +0100
Subject: remaining part of my patch

---
 .../java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java  | 5 ++---
 src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

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

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 b81544e6..c5ee9ba6 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -139,10 +139,9 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		} else {
 			if ((message.getEncryption() != Message.ENCRYPTION_PGP)
 					&& (message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) {
-				String body = Config.PARSE_EMOTICONS ? UIHelper
+				mLastMessage.setText(Config.PARSE_EMOTICONS ? UIHelper
 						.transformAsciiEmoticons(message.getBody()) : message
-						.getBody();
-				mLastMessage.setText(body);
+						.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 60046468..00000e2b 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -225,10 +225,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.messageBody.setVisibility(View.VISIBLE);
 		if (message.getBody() != null) {
 			if (message.getType() != Message.TYPE_PRIVATE) {
-				String body = Config.PARSE_EMOTICONS ? UIHelper
+				viewHolder.messageBody.setText(Config.PARSE_EMOTICONS ? UIHelper
 						.transformAsciiEmoticons(message.getMergedBody())
-						: message.getMergedBody();
-				viewHolder.messageBody.setText(body);
+						: message.getMergedBody());
 			} else {
 				String privateMarker;
 				if (message.getStatus() <= Message.STATUS_RECEIVED) {
-- 
cgit v1.2.3