fix wrong avatar shown when true jid doesn't match in muc

Daniel Gultsch created 8 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/MucOptions.java    | 2 
src/main/java/eu/siacs/conversations/services/AvatarService.java | 8 +
2 files changed, 8 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/MucOptions.java

@@ -511,7 +511,7 @@ public class MucOptions {
 		return null;
 	}
 
-	private User findUserByRealJid(Jid jid) {
+	public User findUserByRealJid(Jid jid) {
 		if (jid == null) {
 			return null;
 		}

src/main/java/eu/siacs/conversations/services/AvatarService.java

@@ -339,7 +339,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);
 				}