diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-20 22:47:52 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-20 22:47:52 +0200 |
| commit | d3728e504f9673e97536d9bd519097c3df961035 (patch) | |
| tree | 00207e961ca1f49d83a6c5f3a43289fabb0e8145 /src/main/java/eu/siacs/conversations/services/AvatarService.java | |
| parent | 893a1a0958d4b9f6d3ba5f81ee29b9341fdc07c5 (diff) | |
| parent | 9ce2cfa3d2e8aac80f8e73855a879baad78dad0d (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/AvatarService.java')
| -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 4cf9ade14..0ab0db2de 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java @@ -246,7 +246,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { if (c != null && (c.getProfilePhoto() != null || c.getAvatar() != null)) { return get(c, size, cachedOnly); } else if (message.getConversation().getMode() == Conversation.MODE_MULTI){ - MucOptions.User user = conversation.getMucOptions().findUser(message.getCounterpart().getResourcepart()); + MucOptions.User user = conversation.getMucOptions().findUserByFullJid(message.getCounterpart()); if (user != null) { return getImpl(user,size,cachedOnly); } |