diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index b6179fa2e..5b7e490dc 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -565,7 +565,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl } else if ((QuickConversationsService.isConversations() || !Config.QUICKSY_DOMAIN.equals(contactJid.getDomain())) && isWithStranger()) { return contactJid; } else { - return this.getContact().getDisplayName();public PresencePacket requestPresenceUpdatesFrom(Contact contact) { + return this.getContact().getDisplayName(); } } diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index c435c1f35..b4fba14b2 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -1889,10 +1889,13 @@ public class XmppConnectionService extends Service { return this.accounts; } + /** + * This will find all conferences with the contact as member and also the conference that is the contact (that 'fake' contact is used to store the avatar) + */ public List<Conversation> findAllConferencesWith(Contact contact) { ArrayList<Conversation> results = new ArrayList<>(); for (final Conversation c : conversations) { - if (c.getMode() == Conversation.MODE_MULTI && c.getMucOptions().isContactInRoom(contact)) { + if (c.getMode() == Conversation.MODE_MULTI && (c.getJid().asBareJid().equals(contact.getJid().asBareJid()) || c.getMucOptions().isContactInRoom(contact))) { results.add(c); } } |