diff options
| author | lookshe <github@lookshe.org> | 2015-01-03 21:31:56 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-01-03 21:31:56 +0100 |
| commit | 48717dd7d37c066ab626fc626a2ced626ef21d42 (patch) | |
| tree | dd953348682f45cde0d812d28b352145fcde8b0e /src/main/java/eu/siacs/conversations/ui/adapter | |
| parent | 6e3e58e3c85e049338fa5b5eff2e99545e15920c (diff) | |
remaining part of my patch
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 5 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 5 |
2 files changed, 4 insertions, 6 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 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) { |