From f4ba34a4e6e9d9248ad3ec6834702a890de3ac27 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 17 Jan 2018 23:55:45 +0100 Subject: fix wrong avatar shown when true jid doesn't match in muc --- src/main/java/de/pixart/messenger/services/AvatarService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/pixart/messenger/services/AvatarService.java') diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java index a0fc5ed53..dac42c63d 100644 --- a/src/main/java/de/pixart/messenger/services/AvatarService.java +++ b/src/main/java/de/pixart/messenger/services/AvatarService.java @@ -343,7 +343,13 @@ 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().findUserByFullJid(message.getCounterpart()); + final Jid trueCounterpart = message.getTrueCounterpart(); + MucOptions.User user; + if (trueCounterpart != null) { + user = conversation.getMucOptions().findUserByRealJid(trueCounterpart); + } else { + user = conversation.getMucOptions().findUserByFullJid(message.getCounterpart()); + } if (user != null) { return getImpl(user, size, cachedOnly); } -- cgit v1.2.3