diff --git a/jicofo-common/src/main/java/org/jitsi/impl/protocol/xmpp/ChatRoomImpl.java b/jicofo-common/src/main/java/org/jitsi/impl/protocol/xmpp/ChatRoomImpl.java index fcddbfb6df..abad2e533e 100644 --- a/jicofo-common/src/main/java/org/jitsi/impl/protocol/xmpp/ChatRoomImpl.java +++ b/jicofo-common/src/main/java/org/jitsi/impl/protocol/xmpp/ChatRoomImpl.java @@ -86,7 +86,7 @@ public class ChatRoomImpl /** * Listener for presence that smack sends on our behalf. */ - private PresenceListener presenceInterceptor; + private org.jivesoftware.smack.util.Consumer presenceInterceptor; /** * Smack multi user chat backend instance. @@ -268,7 +268,7 @@ private void joinAs(Resourcepart nickname) throws SmackException, XMPPException, { this.myOccupantJid = JidCreate.entityFullFrom(roomJid, nickname); - this.presenceInterceptor = packet -> + this.presenceInterceptor = presenceBuilder -> { // The initial presence sent by smack contains an empty "x" // extension. If this extension is included in a subsequent stanza, @@ -277,9 +277,12 @@ private void joinAs(Resourcepart nickname) throws SmackException, XMPPException, // room. synchronized (ChatRoomImpl.this) { - lastPresenceSent = packet.asBuilder((String) null).removeExtension( + Presence p = presenceBuilder.build(); + p.removeExtension( MUCInitialPresence.ELEMENT, - MUCInitialPresence.NAMESPACE); + MUCInitialPresence.NAMESPACE + ); + lastPresenceSent = p.asBuilder(); } }; if (muc.isJoined()) diff --git a/pom.xml b/pom.xml index d50c67ee7e..44feeb883a 100644 --- a/pom.xml +++ b/pom.xml @@ -36,13 +36,13 @@ false 11.0.10 UTF-8 - 4.4.4 + 4.4.6 1.6.21 5.3.0 1.7.32 3.0.4 1.0-119-ga7b23ff - 1.1-118-ge02029b + 1.1-119-gc527d61 4.6.0 5.8.2 @@ -110,6 +110,26 @@ jetty-server ${jetty.version} + + org.igniterealtime.smack + smack-core + ${smack.version} + + + org.igniterealtime.smack + smack-extensions + ${smack.version} + + + org.igniterealtime.smack + smack-java8 + ${smack.version} + + + org.igniterealtime.smack + smack-xmlparser-stax + ${smack.version} + org.igniterealtime.smack smack-tcp @@ -156,7 +176,7 @@ ${project.groupId} jitsi-xmpp-extensions - 1.0-58-g31445c4 + 1.0-59-g76a5c13 org.slf4j