From 11e58607c93f152aad82cfe7951355e03274bf47 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 9 Dec 2015 10:30:26 +0100
Subject: when no avatar found show avatar of contact and not the muc user in
 conferences

---
 src/main/java/eu/siacs/conversations/services/AvatarService.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index be320b6b1..276be10d1 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -77,7 +77,12 @@ public class AvatarService {
 			avatar = mXmppConnectionService.getFileBackend().getAvatar(user.getAvatar(), size);
 		}
 		if (avatar == null) {
-			avatar = get(user.getName(), size, cachedOnly);
+			Contact contact = user.getContact();
+			if (contact != null) {
+				avatar = get(contact, size, cachedOnly);
+			} else {
+				avatar = get(user.getName(), size, cachedOnly);
+			}
 		}
 		this.mXmppConnectionService.getBitmapCache().put(KEY, avatar);
 		return avatar;
-- 
cgit v1.2.3