Do not create persistent chatrooms when inviting contacts to existing one to one chat.

cusax-fix
Damian Minkov 13 years ago
parent 2ffe1873bd
commit 415f7691cc

@ -2479,7 +2479,8 @@ public void inviteContacts( ChatTransport inviteChatTransport,
= conferenceChatManager.createChatRoom(
inviteChatTransport.getProtocolProvider(),
chatContacts,
reason);
reason,
false);
conferenceChatSession
= new ConferenceChatSession(this, chatRoomWrapper);

@ -720,14 +720,17 @@ public void joinChatRoom( ChatRoomWrapper chatRoomWrapper,
* @param protocolProvider the parent protocol provider.
* @param contacts the contacts invited when creating the chat room.
* @param reason
* @param persistent is the room persistent
* @return the <tt>ChatRoomWrapper</tt> corresponding to the created room
*/
public ChatRoomWrapper createChatRoom(
ProtocolProviderService protocolProvider,
Collection<String> contacts,
String reason)
String reason,
boolean persistent)
{
return this.createChatRoom(null, protocolProvider, contacts, reason);
return this.createChatRoom(
null, protocolProvider, contacts, reason, persistent);
}
/**
@ -739,16 +742,18 @@ public ChatRoomWrapper createChatRoom(
* @param protocolProvider the parent protocol provider.
* @param contacts the contacts invited when creating the chat room.
* @param reason
* @param persistent is the room persistent
* @return the <tt>ChatRoomWrapper</tt> corresponding to the created room
*/
public ChatRoomWrapper createChatRoom(
String roomName,
ProtocolProviderService protocolProvider,
Collection<String> contacts,
String reason)
String reason,
boolean persistent)
{
return createChatRoom(
roomName, protocolProvider, contacts, reason, true, true);
roomName, protocolProvider, contacts, reason, true, persistent);
}
/**

@ -106,7 +106,8 @@ public void actionPerformed(ActionEvent e)
.createChatRoom(chatRoomName,
chatRoomProvider.getProtocolProvider(),
null,
"");
"",
true);
}
this.dispose();
}

@ -66,7 +66,8 @@ public void wizardFinished(WizardEvent e)
.createChatRoom(newChatRoom.getChatRoomName(),
newChatRoom.getProtocolProvider(),
null,
"");
"",
true);
}
}
}

Loading…
Cancel
Save