From 271ac7ee7a02f1f6d4c3977b3a891563a1616c05 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 10 Sep 2018 21:05:47 +0200 Subject: [PATCH] Use PossibleFromTypeFilter for MultiUserChat's presence listener --- .../org/jivesoftware/smackx/muc/MultiUserChat.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java index 5a9830011..09f9b5892 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java @@ -47,6 +47,7 @@ import org.jivesoftware.smack.filter.MessageWithSubjectFilter; import org.jivesoftware.smack.filter.MessageWithThreadFilter; import org.jivesoftware.smack.filter.NotFilter; import org.jivesoftware.smack.filter.OrFilter; +import org.jivesoftware.smack.filter.PossibleFromTypeFilter; import org.jivesoftware.smack.filter.PresenceTypeFilter; import org.jivesoftware.smack.filter.StanzaExtensionFilter; import org.jivesoftware.smack.filter.StanzaFilter; @@ -203,11 +204,7 @@ public class MultiUserChat { @Override public void processStanza(final Stanza packet) { final Presence presence = (Presence) packet; - final EntityFullJid from = presence.getFrom().asEntityFullJidIfPossible(); - if (from == null) { - LOGGER.warning("Presence not from a full JID: " + presence.getFrom()); - return; - } + final EntityFullJid from = presence.getFrom().asEntityFullJidOrThrow(); final EntityFullJid myRoomJID = myRoomJid; final boolean isUserStatusModification = presence.getFrom().equals(myRoomJID); @@ -342,7 +339,8 @@ public class MultiUserChat { // Setup the messageListeners and presenceListeners *before* the join presence is send. connection.addSyncStanzaListener(messageListener, fromRoomGroupchatFilter); connection.addSyncStanzaListener(presenceListener, new AndFilter(fromRoomFilter, - StanzaTypeFilter.PRESENCE)); + StanzaTypeFilter.PRESENCE, + PossibleFromTypeFilter.ENTITY_FULL_JID)); // @formatter:off connection.addSyncStanzaListener(subjectListener, new AndFilter(fromRoomFilter,