From d9ff61ea2e2a54e7ac17f13b56016a75c04fc734 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 26 May 2016 22:37:00 +0200 Subject: show contact avatar in muc users unless that contact has its own avatar --- src/main/java/eu/siacs/conversations/services/AvatarService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java index 633758a5..5a58660d 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java @@ -64,7 +64,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { public Bitmap get(final MucOptions.User user, final int size, boolean cachedOnly) { Contact c = user.getContact(); - if (c != null && (c.getProfilePhoto() != null || c.getAvatar() != null)) { + if (c != null && (c.getProfilePhoto() != null || c.getAvatar() != null || user.getAvatar() == null)) { return get(c, size, cachedOnly); } else { return getImpl(user, size, cachedOnly); -- cgit v1.2.3