sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed showing avatars for contacts in muc

This commit is contained in:
Daniel Gultsch 2015-12-04 18:39:09 +01:00
parent 196c8e593f
commit 9d1e8a34b2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/siacs/conversations/services/AvatarService.java
View File

@ -59,6 +59,15 @@ public class AvatarService {
} }
public Bitmap get(final MucOptions.User user, final int size, boolean cachedOnly) { 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)) {
return get(c, size, cachedOnly);
} else {
return getImpl(user, size, cachedOnly);
}
}
private Bitmap getImpl(final MucOptions.User user, final int size, boolean cachedOnly) {
final String KEY = key(user, size); final String KEY = key(user, size);
Bitmap avatar = this.mXmppConnectionService.getBitmapCache().get(KEY); Bitmap avatar = this.mXmppConnectionService.getBitmapCache().get(KEY);
if (avatar != null || cachedOnly) { if (avatar != null || cachedOnly) {
@ -232,7 +241,7 @@ public class AvatarService {
} else if (message.getConversation().getMode() == Conversation.MODE_MULTI){ } else if (message.getConversation().getMode() == Conversation.MODE_MULTI){
MucOptions.User user = conversation.getMucOptions().findUser(message.getCounterpart().getResourcepart()); MucOptions.User user = conversation.getMucOptions().findUser(message.getCounterpart().getResourcepart());
if (user != null) { if (user != null) {
return get(user,size,cachedOnly); return getImpl(user,size,cachedOnly);
} }
} }
return get(UIHelper.getMessageDisplayName(message), size, cachedOnly); return get(UIHelper.getMessageDisplayName(message), size, cachedOnly);