vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-25 03:57:58 +01:00
Code Issues Releases Wiki Activity

[muc] Use EntityBareJid instead of String in GroupChatInvitation

Browse source 
Also factor provider in extra file.
This commit is contained in:
Florian Schmaus 2022-08-01 21:54:37 +02:00
parent ccf60b018e
commit 711d7d92bd
3 changed files with 49 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
View file

@ -14,20 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jivesoftware.smackx.muc.packet;
import java.io.IOException;
import javax.xml.namespace.QName;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.EntityBareJid;
/**
* A group chat invitation stanza extension, which is used to invite other
@ -72,7 +67,7 @@ public class GroupChatInvitation implements ExtensionElement {
public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
private final String roomAddress;
private final EntityBareJid roomAddress;
/**
* Creates a new group chat invitation to the specified room address.
@ -82,7 +77,7 @@ public class GroupChatInvitation implements ExtensionElement {
*
* @param roomAddress the address of the group chat room.
*/
public GroupChatInvitation(String roomAddress) {
public GroupChatInvitation(EntityBareJid roomAddress) {
this.roomAddress = roomAddress;
}
@ -93,7 +88,7 @@ public class GroupChatInvitation implements ExtensionElement {
*
* @return the address of the group chat room.
*/
public String getRoomAddress() {
public EntityBareJid getRoomAddress() {
return roomAddress;
}
@ -124,16 +119,4 @@ public class GroupChatInvitation implements ExtensionElement {
return packet.getExtension(GroupChatInvitation.class);
}
public static class Provider extends ExtensionElementProvider<GroupChatInvitation> {
@Override
public GroupChatInvitation parse(XmlPullParser parser,
int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException,
IOException {
String roomAddress = parser.getAttributeValue("", "jid");
// Advance to end of extension.
parser.next();
return new GroupChatInvitation(roomAddress);
}
}
}

43
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/GroupChatInvitationProvider.java Normal file
View file

@ -0,0 +1,43 @@
/**
*
* Copyright 2003-2007 Jive Software, 2022 Florian Schmaus.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jivesoftware.smackx.muc.provider;
import java.io.IOException;
import java.text.ParseException;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.parsing.SmackParsingException;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.muc.packet.GroupChatInvitation;
import org.jxmpp.jid.EntityBareJid;
public class GroupChatInvitationProvider extends ExtensionElementProvider<GroupChatInvitation> {
@Override
public GroupChatInvitation parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
throws XmlPullParserException, IOException, SmackParsingException, ParseException {
EntityBareJid roomAddress = ParserUtils.getBareJidAttribute(parser);
// Advance to end of extension.
parser.next();
return new GroupChatInvitation(roomAddress);
}
}

2
smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers
View file

@ -516,7 +516,7 @@
<extensionProvider>
<elementName>x</elementName>
<namespace>jabber:x:conference</namespace>
<className>org.jivesoftware.smackx.muc.packet.GroupChatInvitation$Provider</className>
<className>org.jivesoftware.smackx.muc.provider.GroupChatInvitationProvider</className>
</extensionProvider>
<!-- XEP-0297: Stanza Forwarding -->