use same socket time out for jingle and xmpp connections

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/Config.java              | 2 +-
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/Config.java

@@ -11,7 +11,7 @@ public final class Config {
 	public static final int PING_MAX_INTERVAL = 300;
 	public static final int PING_MIN_INTERVAL = 30;
 	public static final int PING_TIMEOUT = 10;
-	public static final int SOCKET_TIMEOUT = 20;
+	public static final int SOCKET_TIMEOUT = 15;
 	public static final int CONNECT_TIMEOUT = 90;
 	public static final int CARBON_GRACE_PERIOD = 60;
 	public static final int MINI_GRACE_PERIOD = 750;

src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java

@@ -187,7 +187,7 @@ public class XmppConnection implements Runnable {
 									+ srvRecordServer + ":" + srvRecordPort);
 						}
 						socket = new Socket();
-						socket.connect(addr, 20000);
+						socket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
 						socketError = false;
 					} catch (final UnknownHostException e) {
 						Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());