diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-27 23:52:08 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-27 23:52:08 +0200 |
commit | 5a1105d37a87eaf1c369d9f8d9b7e67d6a0e1cd4 (patch) | |
tree | f3ca7e213d3adbfcbb929e10a6b35a2eb6f789e4 /src/main/java/de/pixart/messenger/services/AvatarService.java | |
parent | 39194d6e1b4a5ebaabdc1afc7ffbdc6eede68aca (diff) |
display avatar in groups
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/services/AvatarService.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java index d6cc3712c..f38102866 100644 --- a/src/main/java/de/pixart/messenger/services/AvatarService.java +++ b/src/main/java/de/pixart/messenger/services/AvatarService.java @@ -274,12 +274,15 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { if (bitmap != null || cachedOnly) { return bitmap; } - final List<MucOptions.User> users = mucOptions.getUsersRelevantForNameAndAvatar(); - if (users.size() == 0) { - Conversation c = mucOptions.getConversation(); - bitmap = getImpl(c.getName().toString(), c.getJid().asBareJid().toString(), size); - } else { - bitmap = getImpl(users, size); + bitmap = mXmppConnectionService.getFileBackend().getAvatar(mucOptions.getAvatar(), size); + if (bitmap == null) { + final List<MucOptions.User> users = mucOptions.getUsersRelevantForNameAndAvatar(); + if (users.size() == 0) { + Conversation c = mucOptions.getConversation(); + bitmap = getImpl(c.getName().toString(), c.getJid().asBareJid().toString(), size); + } else { + bitmap = getImpl(users, size); + } } this.mXmppConnectionService.getBitmapCache().put(KEY, bitmap); return bitmap; |