diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-26 22:37:00 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-26 22:37:00 +0200 |
| commit | d9ff61ea2e2a54e7ac17f13b56016a75c04fc734 (patch) | |
| tree | a6bc4a0f6b7b3d769fc7419a5ad61a0f314f8914 /src/main/java/eu | |
| parent | 841e718d6aaf335d5750170da181a6443c7c8048 (diff) | |
show contact avatar in muc users unless that contact has its own avatar
Diffstat (limited to 'src/main/java/eu')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/AvatarService.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); |