mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixing setting of socket timeout in HTTPS connections

Browse source
This commit is contained in:
David A. Velasco 2012-08-17 14:28:46 +02:00
parent b5e8b4bde5
commit 1b2a3581ff
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/com/owncloud/android/authenticator/EasySSLSocketFactory.java
View file

@ -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;
//}
}
/**