From 377bd49ee807b9a06089ad5612ca15b9b00f2e36 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sun, 9 Nov 2014 16:21:13 +0100
Subject: refactored code to always contain full jid for counterpart

---
 .../conversations/ui/adapter/MessageAdapter.java   | 24 ++++++++--------------
 1 file changed, 8 insertions(+), 16 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 465d7bc3..cefe42a7 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -135,16 +135,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				Contact contact = message.getContact();
 				if (contact != null) {
 					info = contact.getDisplayName();
+				} else if (message.getCounterpart() != null) {
+					info = message.getCounterpart().getResourcepart();
 				} else {
-					if (message.getPresence() != null) {
-                        if (message.getPresence().isBareJid()) {
-                            info = message.getPresence().toString();
-                        } else {
-                            info = message.getPresence().getResourcepart();
-                        }
-					} else {
-						info = message.getCounterpart().toString();
-					}
+					info = "";
 				}
 			}
 			break;
@@ -232,11 +226,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					privateMarker = activity
 							.getString(R.string.private_message);
 				} else {
-					final Jid to;
-					if (message.getPresence() != null) {
-						to = message.getPresence();
+					final String to;
+					if (message.getCounterpart() != null) {
+						to = message.getCounterpart().getResourcepart();
 					} else {
-						to = message.getCounterpart();
+						to = "";
 					}
 					privateMarker = activity.getString(R.string.private_message_to, to);
 				}
@@ -417,9 +411,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			if (contact != null) {
 				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(contact, activity.getPixel(48)));
 			} else if (item.getConversation().getMode() == Conversation.MODE_MULTI) {
-				final Jid name = item.getPresence() != null ? item.getPresence() : item.getCounterpart();
-				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(
-                        name.isBareJid() ? name.toString() : name.getResourcepart(),
+				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(item.getCounterpart().getResourcepart(),
                         activity.getPixel(48)));
 			}
 		} else if (type == SENT) {
-- 
cgit v1.2.3