Extra logs for debugging connections

diff --git a/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java b/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java
index 0a3f8be..7503546 100644 (file)
--- a/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java
+++ b/src/com/owncloud/android/authenticator/EasySSLSocketFactory.java
@@ -115,6 +115,7 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory {
     }
 
     private static SSLContext createEasySSLContext() {
     }
 
     private static SSLContext createEasySSLContext() {

+        Log.d(TAG, "Creating Easy SSL Context");

         try {
             SSLContext context = SSLContext.getInstance("TLS");
             context.init(null, new TrustManager[] { new EasyX509TrustManager(
         try {
             SSLContext context = SSLContext.getInstance("TLS");
             context.init(null, new TrustManager[] { new EasyX509TrustManager(


@@ -127,6 +128,7 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory {
     }
 
     private SSLContext getSSLContext() {
     }
 
     private SSLContext getSSLContext() {

+        Log.d(TAG, "Getting Easy SSL Context");

         if (this.sslcontext == null) {
             this.sslcontext = createEasySSLContext();
         }
         if (this.sslcontext == null) {
             this.sslcontext = createEasySSLContext();
         }


@@ -138,6 +140,7 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory {
      */
     public Socket createSocket(String host, int port, InetAddress clientHost,
             int clientPort) throws IOException, UnknownHostException {
      */
     public Socket createSocket(String host, int port, InetAddress clientHost,
             int clientPort) throws IOException, UnknownHostException {

+        Log.d(TAG, "Creating SSL Socket with remote " + host + ":" + port + ", client " + clientHost + ":" + clientPort);

 
         return getSSLContext().getSocketFactory().createSocket(host, port,
                 clientHost, clientPort);
 
         return getSSLContext().getSocketFactory().createSocket(host, port,
                 clientHost, clientPort);


@@ -170,17 +173,20 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory {
             final InetAddress localAddress, final int localPort,
             final HttpConnectionParams params) throws IOException,
             UnknownHostException, ConnectTimeoutException {
             final InetAddress localAddress, final int localPort,
             final HttpConnectionParams params) throws IOException,
             UnknownHostException, ConnectTimeoutException {

+        Log.d(TAG, "Creating SSL Socket with remote " + host + ":" + port + ", local " + localAddress + ":" + localPort + ", params: " + params);

         if (params == null) {
             throw new IllegalArgumentException("Parameters may not be null");
         }
         int timeout = params.getConnectionTimeout();
         SocketFactory socketfactory = getSSLContext().getSocketFactory();
         if (timeout == 0) {
         if (params == null) {
             throw new IllegalArgumentException("Parameters may not be null");
         }
         int timeout = params.getConnectionTimeout();
         SocketFactory socketfactory = getSSLContext().getSocketFactory();
         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 {
             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);
             Socket socket = socketfactory.createSocket();
             SocketAddress localaddr = new InetSocketAddress(localAddress,
                     localPort);


@@ -197,6 +203,7 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory {
      */
     public Socket createSocket(String host, int port) throws IOException,
             UnknownHostException {
      */
     public Socket createSocket(String host, int port) throws IOException,
             UnknownHostException {

+        Log.d(TAG, "Creating SSL Socket with remote " + host + ":" + port);

         return getSSLContext().getSocketFactory().createSocket(host, port);
     }
 
         return getSSLContext().getSocketFactory().createSocket(host, port);
     }
 


@@ -205,6 +212,7 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory {
      */
     public Socket createSocket(Socket socket, String host, int port,
             boolean autoClose) throws IOException, UnknownHostException {
      */
     public Socket createSocket(Socket socket, String host, int port,
             boolean autoClose) throws IOException, UnknownHostException {

+        Log.d(TAG, "Creating SSL Socket from other shocket " + socket + " to remote " + host + ":" + port);

         return getSSLContext().getSocketFactory().createSocket(socket, host,
                 port, autoClose);
     }
         return getSSLContext().getSocketFactory().createSocket(socket, host,
                 port, autoClose);
     }

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 1fabe3a..493c4b8 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -84,6 +84,8 @@ public class WebdavClient extends HttpClient {
      * @return\r
      */\r
     public WebdavClient (Account account, Context context) {\r
      * @return\r
      */\r
     public WebdavClient (Account account, Context context) {\r

+        Log.d(TAG, "Creating WebdavClient associated to " + account.name);\r
+        \r

         setDefaultTimeouts();\r
         \r
         OwnCloudVersion ownCloudVersion = new OwnCloudVersion(AccountManager.get(context).getUserData(account,\r
         setDefaultTimeouts();\r
         \r
         OwnCloudVersion ownCloudVersion = new OwnCloudVersion(AccountManager.get(context).getUserData(account,\r


@@ -100,6 +102,7 @@ public class WebdavClient extends HttpClient {
     \r
     public WebdavClient() {\r
         super(getMultiThreadedConnManager());\r
     \r
     public WebdavClient() {\r
         super(getMultiThreadedConnManager());\r

+        Log.d(TAG, "Creating WebdavClient");\r

         \r
         setDefaultTimeouts();\r
         \r
         \r
         setDefaultTimeouts();\r
         \r