Do not show contact's avatar on every message, avoid loading own avatar, only register click listeners when avatar is present

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index b2dca6b9..5c62b1f4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -543,8 +543,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			viewHolder.status_message.setText(message.getBody());
 			return view;
 		} else {
+            if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
                 loadAvatar(message, viewHolder.contact_picture);
-		}
+
 
                 viewHolder.contact_picture
                         .setOnClickListener(new OnClickListener() {
@@ -572,6 +573,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                                 }
                             }
                         });
+            } else {
+                viewHolder.contact_picture.setVisibility(View.GONE);
+            }
+		}
 
 		final Transferable transferable = message.getTransferable();
 		if (transferable != null && transferable.getStatus() != Transferable.STATUS_UPLOADING) {