From a887cde1ce62498b9ca8c183f2e67ed2dbfb235d Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 4 Apr 2017 14:08:19 +0200 Subject: [PATCH] Allow MUC room subject changes from the MUCs bare JID Fixes SMACK-754. --- .../main/java/org/jivesoftware/smackx/muc/MultiUserChat.java | 4 ---- .../org/jivesoftware/smackx/muc/SubjectUpdatedListener.java | 2 +- 2 files changed, 1 insertion(+), 5 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 1bc1de725..5b962127f 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 @@ -170,10 +170,6 @@ public class MultiUserChat { public void processStanza(Stanza packet) { Message msg = (Message) packet; EntityFullJid from = msg.getFrom().asEntityFullJidIfPossible(); - if (from == null) { - LOGGER.warning("Message subject not changed by a full JID: " + msg.getFrom()); - return; - } // Update the room subject subject = msg.getSubject(); // Fire event for subject updated listeners diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java index ee5f0e337..91bae3f1a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java @@ -30,7 +30,7 @@ public interface SubjectUpdatedListener { * Called when a MUC room has changed its subject. * * @param subject the new room's subject. - * @param from the user that changed the room's subject (e.g. room@conference.jabber.org/nick). + * @param from the user that changed the room's subject or null if the room itself changed the subject. */ public abstract void subjectUpdated(String subject, EntityFullJid from);