vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[muc] Add MultiUserChat.getMyRoomJid()

This commit is contained in:
Florian Schmaus 2021-12-20 22:40:37 +01:00
parent 56ca31b156
commit e530db2e6d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
View File

@ -205,7 +205,7 @@ public class MultiUserChat {
if (from == null) { if (from == null) {
return; return;
} }
final EntityFullJid myRoomJID = myRoomJid; final EntityFullJid myRoomJID = getMyRoomJid();
final boolean isUserStatusModification = presence.getFrom().equals(myRoomJID); final boolean isUserStatusModification = presence.getFrom().equals(myRoomJID);
final MUCUser mucUser = MUCUser.from(packet); final MUCUser mucUser = MUCUser.from(packet);
@ -732,7 +732,7 @@ public class MultiUserChat {
* @return true if currently in the multi user chat room. * @return true if currently in the multi user chat room.
*/ */
public boolean isJoined() { public boolean isJoined() {
return myRoomJid != null; return getMyRoomJid() != null;
} }
/** /**
@ -768,7 +768,7 @@ public class MultiUserChat {
// "if (!joined) return" because it should be always be possible to leave the room in case the instance's // "if (!joined) return" because it should be always be possible to leave the room in case the instance's
// state does not reflect the actual state. // state does not reflect the actual state.
final EntityFullJid myRoomJid = this.myRoomJid; final EntityFullJid myRoomJid = getMyRoomJid();
if (myRoomJid == null) { if (myRoomJid == null) {
throw new MucNotJoinedException(this); throw new MucNotJoinedException(this);
} }
@ -1200,13 +1200,23 @@ public class MultiUserChat {
* @return the nickname currently being used. * @return the nickname currently being used.
*/ */
public Resourcepart getNickname() { public Resourcepart getNickname() {
final EntityFullJid myRoomJid = this.myRoomJid; final EntityFullJid myRoomJid = getMyRoomJid();
if (myRoomJid == null) { if (myRoomJid == null) {
return null; return null;
} }
return myRoomJid.getResourcepart(); return myRoomJid.getResourcepart();
} }
/**
* Return the full JID of the user in the room, or <code>null</code> if the room is not joined.
*
* @return the full JID of the user in the room, or <code>null</code>.
* @since 4.5.0
*/
public EntityFullJid getMyRoomJid() {
return myRoomJid;
}
/** /**
* Changes the occupant's nickname to a new nickname within the room. Each room occupant * Changes the occupant's nickname to a new nickname within the room. Each room occupant
* will receive two presence packets. One of type "unavailable" for the old nickname and one * will receive two presence packets. One of type "unavailable" for the old nickname and one
@ -1263,7 +1273,7 @@ public class MultiUserChat {
* @throws MucNotJoinedException if not joined to the Multi-User Chat. * @throws MucNotJoinedException if not joined to the Multi-User Chat.
*/ */
public void changeAvailabilityStatus(String status, Presence.Mode mode) throws NotConnectedException, InterruptedException, MucNotJoinedException { public void changeAvailabilityStatus(String status, Presence.Mode mode) throws NotConnectedException, InterruptedException, MucNotJoinedException {
final EntityFullJid myRoomJid = this.myRoomJid; final EntityFullJid myRoomJid = getMyRoomJid();
if (myRoomJid == null) { if (myRoomJid == null) {
throw new MucNotJoinedException(this); throw new MucNotJoinedException(this);
} }