X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/67771a67081193fae35fca79755f320878e598ab..be22e58b398f6bc6e47ecd1695ababa353e2ba3b:/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java diff --git a/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java b/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java index 75035464..1bb1aa6b 100644 --- a/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java +++ b/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java @@ -179,23 +179,23 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory { } int timeout = params.getConnectionTimeout(); SocketFactory socketfactory = getSSLContext().getSocketFactory(); - if (timeout == 0) { + /*if (timeout == 0) { Log.d(TAG, " ... with connection timeout 0 and socket timeout " + params.getSoTimeout()); Socket socket = socketfactory.createSocket(host, port, localAddress, localPort); socket.setSoTimeout(params.getSoTimeout()); return socket; - } else { - Log.d(TAG, " ... with connection timeout " + timeout + " and socket timeout" + params.getSoTimeout()); - Socket socket = socketfactory.createSocket(); - SocketAddress localaddr = new InetSocketAddress(localAddress, - localPort); - SocketAddress remoteaddr = new InetSocketAddress(host, port); - socket.setSoTimeout(params.getSoTimeout()); - socket.bind(localaddr); - socket.connect(remoteaddr, timeout); - return socket; - } + } else {*/ + Log.d(TAG, " ... with connection timeout " + timeout + " and socket timeout " + params.getSoTimeout()); + Socket socket = socketfactory.createSocket(); + SocketAddress localaddr = new InetSocketAddress(localAddress, + localPort); + SocketAddress remoteaddr = new InetSocketAddress(host, port); + socket.setSoTimeout(params.getSoTimeout()); + socket.bind(localaddr); + socket.connect(remoteaddr, timeout); + return socket; + //} } /**