Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 08:12:05 +01:00
Code Issues Releases Wiki Activity

Use connection's reply timeout value in MultiUserChat

Browse source
This commit is contained in:
Florian Schmaus 2014-04-03 10:43:46 +02:00
parent 665d65836c
commit 246e7b85f8
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
View file

@ -40,7 +40,6 @@ import org.jivesoftware.smack.MessageListener;
import org.jivesoftware.smack.PacketCollector; import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.PacketInterceptor; import org.jivesoftware.smack.PacketInterceptor;
import org.jivesoftware.smack.PacketListener; import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NoResponseException;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
@ -377,7 +376,7 @@ public class MultiUserChat {
/** /**
* Joins the chat room using the specified nickname. If already joined * Joins the chat room using the specified nickname. If already joined
* using another nickname, this method will first leave the room and then * using another nickname, this method will first leave the room and then
* re-join using the new nickname. The default timeout of Smack for a reply * re-join using the new nickname. The default connection timeout for a reply
* from the group chat server that the join succeeded will be used. After * from the group chat server that the join succeeded will be used. After
* joining the room, the room will decide the amount of history to send. * joining the room, the room will decide the amount of history to send.
* *
@ -393,13 +392,13 @@ public class MultiUserChat {
* @throws NotConnectedException * @throws NotConnectedException
*/ */
public void join(String nickname) throws NoResponseException, XMPPErrorException, NotConnectedException { public void join(String nickname) throws NoResponseException, XMPPErrorException, NotConnectedException {
join(nickname, null, null, SmackConfiguration.getDefaultPacketReplyTimeout()); join(nickname, null, null, connection.getPacketReplyTimeout());
} }
/** /**
* Joins the chat room using the specified nickname and password. If already joined * Joins the chat room using the specified nickname and password. If already joined
* using another nickname, this method will first leave the room and then * using another nickname, this method will first leave the room and then
* re-join using the new nickname. The default timeout of Smack for a reply * re-join using the new nickname. The default connection timeout for a reply
* from the group chat server that the join succeeded will be used. After * from the group chat server that the join succeeded will be used. After
* joining the room, the room will decide the amount of history to send.<p> * joining the room, the room will decide the amount of history to send.<p>
* *
@ -417,7 +416,7 @@ public class MultiUserChat {
* @throws SmackException if there was no response from the server. * @throws SmackException if there was no response from the server.
*/ */
public void join(String nickname, String password) throws XMPPErrorException, SmackException { public void join(String nickname, String password) throws XMPPErrorException, SmackException {
join(nickname, password, null, SmackConfiguration.getDefaultPacketReplyTimeout()); join(nickname, password, null, connection.getPacketReplyTimeout());
} }
/** /**