implements FS#271: Remove own Avatar from message display

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index f67ad887c..9c6cb5ac9 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -1018,7 +1018,12 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
             }
             return view;
         } else {
-            AvatarWorkerTask.loadAvatar(message, viewHolder.contact_picture, R.dimen.avatar);
+            if (message.getStatus() > Message.STATUS_RECEIVED) {
+                view.findViewById(R.id.placeholder).setVisibility(View.GONE);
+                viewHolder.contact_picture.setVisibility(View.GONE);
+            } else {
+                AvatarWorkerTask.loadAvatar(message, viewHolder.contact_picture, R.dimen.avatar);
+            }
         }
 
         resetClickListener(viewHolder.message_box, viewHolder.messageBody);