very much unoptimized search functionality

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java
index 81afa9342..d734d6f39 100644
--- a/src/main/java/de/pixart/messenger/services/AvatarService.java
+++ b/src/main/java/de/pixart/messenger/services/AvatarService.java
@@ -28,6 +28,7 @@ import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Bookmark;
 import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.entities.Conversational;
 import de.pixart.messenger.entities.ListItem;
 import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.entities.MucOptions;
@@ -400,20 +401,21 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
     }
 
     public Bitmap get(Message message, int size, boolean cachedOnly) {
-        final Conversation conversation = message.getConversation();
+        final Conversational conversation = message.getConversation();
         if (message.getType() == Message.TYPE_STATUS && message.getCounterparts() != null && message.getCounterparts().size() > 1) {
             return get(message.getCounterparts(), size, cachedOnly);
         } else if (message.getStatus() == Message.STATUS_RECEIVED) {
             Contact c = message.getContact();
             if (c != null && (c.getProfilePhoto() != null || c.getAvatar() != null)) {
                 return get(c, size, cachedOnly);
-            } else if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
+            } else if (conversation instanceof Conversation && message.getConversation().getMode() == Conversation.MODE_MULTI) {
                 final Jid trueCounterpart = message.getTrueCounterpart();
+                final MucOptions mucOptions = ((Conversation) conversation).getMucOptions();
                 MucOptions.User user;
                 if (trueCounterpart != null) {
-                    user = conversation.getMucOptions().findUserByRealJid(trueCounterpart);
+                    user = mucOptions.findUserByRealJid(trueCounterpart);
                 } else {
-                    user = conversation.getMucOptions().findUserByFullJid(message.getCounterpart());
+                    user = mucOptions.findUserByFullJid(message.getCounterpart());
                 }
                 if (user != null) {
                     return getImpl(user, size, cachedOnly);