make confirmation dialog more universal

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / authenticator / EasySSLSocketFactory.java

diff --git a/src/eu/alefzero/owncloud/authenticator/EasySSLSocketFactory.java b/src/eu/alefzero/owncloud/authenticator/EasySSLSocketFactory.java
index c4531ba..f1de8f5 100644 (file)
--- a/src/eu/alefzero/owncloud/authenticator/EasySSLSocketFactory.java
+++ b/src/eu/alefzero/owncloud/authenticator/EasySSLSocketFactory.java
@@ -176,13 +176,16 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory {
         int timeout = params.getConnectionTimeout();
         SocketFactory socketfactory = getSSLContext().getSocketFactory();
         if (timeout == 0) {
-            return socketfactory.createSocket(host, port, localAddress,
+            Socket socket = socketfactory.createSocket(host, port, localAddress,
                     localPort);
+            socket.setSoTimeout(params.getSoTimeout());
+            return socket;
         } else {
             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;