persist muc avatar and show in bookmarks

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java
index 06b0e1f5f..bf415515b 100644
--- a/src/main/java/de/pixart/messenger/services/AvatarService.java
+++ b/src/main/java/de/pixart/messenger/services/AvatarService.java
@@ -54,7 +54,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 
     protected XmppConnectionService mXmppConnectionService = null;
 
-    public AvatarService(XmppConnectionService service) {
+    AvatarService(XmppConnectionService service) {
         this.mXmppConnectionService = service;
     }
 
@@ -231,7 +231,13 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
             if (bookmark.getConversation() != null) {
                 return get(bookmark.getConversation(), size, cachedOnly);
             } else {
-                String seed = bookmark.getJid() != null ? bookmark.getJid().asBareJid().toString() : null;
+                Jid jid = bookmark.getJid();
+                Account account = bookmark.getAccount();
+                Contact contact = jid == null ? null : account.getRoster().getContact(jid);
+                if (contact != null && contact.getAvatar() != null) {
+                    return get(contact, size, cachedOnly);
+                }
+                String seed = jid != null ? jid.asBareJid().toString() : null;
                 return get(bookmark.getDisplayName(), seed, size, cachedOnly);
             }
         } else {