diff options
| author | Damian Minkov <damencho@jitsi.org> | 2014-05-12 13:06:38 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2014-05-12 13:10:32 +0300 |
| commit | 10499517879fe33b411de14924c6127224b84f09 (patch) | |
| tree | 7f4a4eeafea612fd688c1f6382e902a638089e03 /src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java | |
| parent | ab7e9685cadd6545e18acd5b4aa8b1c498ee245a (diff) | |
| download | jitsi-10499517879fe33b411de14924c6127224b84f09.zip jitsi-10499517879fe33b411de14924c6127224b84f09.tar.gz jitsi-10499517879fe33b411de14924c6127224b84f09.tar.bz2 | |
Uses display name when accepted invitation to join a chat room.
Diffstat (limited to 'src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java')
| -rw-r--r-- | src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java b/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java index 67fc58f..a08f38a 100644 --- a/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java +++ b/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java @@ -51,8 +51,20 @@ public class MUCServiceImpl ChatRoom chatRoom = invitation.getTargetChatRoom();
byte[] password = invitation.getChatRoomPassword();
- String nickName
- = chatRoom.getParentProvider().getAccountID().getUserID();
+ String nickName =
+ ConfigurationUtils.getChatRoomProperty(
+ chatRoom.getParentProvider(),
+ chatRoom.getIdentifier(), "userNickName");
+ if(nickName == null)
+ {
+ String[] joinOptions = ChatRoomJoinOptionsDialog.getJoinOptions(
+ true,
+ chatRoom.getParentProvider(),
+ chatRoom.getIdentifier(),
+ MUCActivator.getGlobalDisplayDetailsService()
+ .getDisplayName(chatRoom.getParentProvider()));
+ nickName = joinOptions[0];
+ }
joinChatRoom(chatRoom, nickName, password);
}
|