From 2e03f0f3f322cda297ff39a4d3eb8f44cb8a7ec2 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Fri, 17 Jul 2015 09:06:40 +0200 Subject: [PATCH] Improve HostedRoom API return EntityBareJid instead of Jid. --- .../java/org/jivesoftware/smackx/muc/HostedRoom.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java index 601606be0..3f97eed23 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java @@ -16,8 +16,9 @@ */ package org.jivesoftware.smackx.muc; +import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smackx.disco.packet.DiscoverItems; -import org.jxmpp.jid.Jid; +import org.jxmpp.jid.EntityBareJid; /** * Hosted rooms by a chat service may be discovered if they are configured to appear in the room @@ -32,12 +33,13 @@ import org.jxmpp.jid.Jid; */ public class HostedRoom { - private final Jid jid; + private final EntityBareJid jid; private final String name; public HostedRoom(DiscoverItems.Item item) { - jid = item.getEntityID(); + jid = Objects.requireNonNull(item.getEntityID().asEntityBareJidIfPossible(), + "The discovered item must be an entity bare JID"); name = item.getName(); } @@ -47,7 +49,7 @@ public class HostedRoom { * * @return the XMPP address of the hosted room by the chat service. */ - public Jid getJid() { + public EntityBareJid getJid() { return jid; }