Added timeout to the connection test; timeoutted methods granted for HTTPS

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c4b2f9..20ba378 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.164B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.165B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java b/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
index 62131ef..4e17884 100644 (file)
--- a/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
+++ b/src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java
@@ -19,6 +19,7 @@
 package eu.alefzero.owncloud.authenticator;
 
 import java.net.ConnectException;
 package eu.alefzero.owncloud.authenticator;
 
 import java.net.ConnectException;

+import java.net.SocketTimeoutException;

 import java.net.UnknownHostException;
 
 import javax.net.ssl.SSLHandshakeException;
 import java.net.UnknownHostException;
 
 import javax.net.ssl.SSLHandshakeException;


@@ -39,6 +40,10 @@ import android.os.Handler;
 import android.util.Log;
 
 public class ConnectionCheckerRunnable implements Runnable {
 import android.util.Log;
 
 public class ConnectionCheckerRunnable implements Runnable {

+    
+    /** Maximum time to wait for a response from the server when the connection is being tested, in MILLISECONDs.  */
+    public static final int TRY_CONNECTION_TIMEOUT = 5000;
+    

     private static final String TAG = "ConnectionCheckerRunnable";
     private OnConnectCheckListener mListener;
     private String mUrl;
     private static final String TAG = "ConnectionCheckerRunnable";
     private OnConnectCheckListener mListener;
     private String mUrl;


@@ -99,7 +104,7 @@ public class ConnectionCheckerRunnable implements Runnable {
         GetMethod get = new GetMethod(uri.toString());
         boolean retval = false;
         try {
         GetMethod get = new GetMethod(uri.toString());
         boolean retval = false;
         try {

-            int status = wc.executeMethod(get);
+            int status = wc.executeMethod(get, TRY_CONNECTION_TIMEOUT);

             switch (status) {
             case HttpStatus.SC_OK: {
                 String response = get.getResponseBodyAsString();
             switch (status) {
             case HttpStatus.SC_OK: {
                 String response = get.getResponseBodyAsString();


@@ -127,7 +132,8 @@ public class ConnectionCheckerRunnable implements Runnable {
 
         } catch (Exception e) {
             if (e instanceof UnknownHostException
 
         } catch (Exception e) {
             if (e instanceof UnknownHostException

-                    || e instanceof ConnectException) {
+                    || e instanceof ConnectException 
+                    || e instanceof SocketTimeoutException) {

                 mLatestResult = ResultType.HOST_NOT_AVAILABLE;
             } else if (e instanceof JSONException) {
                 mLatestResult = ResultType.INSTANCE_NOT_CONFIGURED;
                 mLatestResult = ResultType.HOST_NOT_AVAILABLE;
             } else if (e instanceof JSONException) {
                 mLatestResult = ResultType.INSTANCE_NOT_CONFIGURED;

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) {
         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);
                     localPort);

+            socket.setSoTimeout(params.getSoTimeout());
+            return socket;

         } else {
             Socket socket = socketfactory.createSocket();
             SocketAddress localaddr = new InetSocketAddress(localAddress,
                     localPort);
             SocketAddress remoteaddr = new InetSocketAddress(host, port);
         } 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;
             socket.bind(localaddr);
             socket.connect(remoteaddr, timeout);
             return socket;

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 63d11bf..7aa5ffb 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -758,6 +758,9 @@ public class FileDetailFragment extends SherlockFragment implements
     \r
     private class RemoveRunnable implements Runnable {\r
         \r
     \r
     private class RemoveRunnable implements Runnable {\r
         \r

+        /** Arbitrary timeout for deletion */\r
+        public final static int DELETION_TIMEOUT = 5000;\r
+        \r

         Account mAccount;\r
         OCFile mFileToRemove;\r
         Handler mHandler;\r
         Account mAccount;\r
         OCFile mFileToRemove;\r
         Handler mHandler;\r


@@ -777,13 +780,10 @@ public class FileDetailFragment extends SherlockFragment implements
             Log.d("ASD", ""+baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath()));\r
 \r
             DeleteMethod delete = new DeleteMethod(baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath()));\r
             Log.d("ASD", ""+baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath()));\r
 \r
             DeleteMethod delete = new DeleteMethod(baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath()));\r

-            HttpMethodParams params = delete.getParams();\r
-            params.setSoTimeout(1000);\r
-            delete.setParams(params);\r

             \r
             boolean success = false;\r
             try {\r
             \r
             boolean success = false;\r
             try {\r

-                int status = wc.executeMethod(delete);\r
+                int status = wc.executeMethod(delete, DELETION_TIMEOUT);\r

                 if (delete.succeeded()) {\r
                     FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
                     fdsm.removeFile(mFileToRemove);\r
                 if (delete.succeeded()) {\r
                     FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
                     fdsm.removeFile(mFileToRemove);\r

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index e248eb8..44b6e6b 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -24,7 +24,8 @@ import java.io.IOException;
 \r
 import org.apache.commons.httpclient.Credentials;\r
 import org.apache.commons.httpclient.HttpClient;\r
 \r
 import org.apache.commons.httpclient.Credentials;\r
 import org.apache.commons.httpclient.HttpClient;\r

-import org.apache.commons.httpclient.HttpConnectionManager;\r
+import org.apache.commons.httpclient.HttpException;\r
+import org.apache.commons.httpclient.HttpMethodBase;\r

 import org.apache.commons.httpclient.HttpVersion;\r
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;\r
 import org.apache.commons.httpclient.UsernamePasswordCredentials;\r
 import org.apache.commons.httpclient.HttpVersion;\r
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;\r
 import org.apache.commons.httpclient.UsernamePasswordCredentials;\r


@@ -123,15 +124,12 @@ public class WebdavClient extends HttpClient {
     public boolean downloadFile(String remoteFilepath, File targetPath) {\r
         boolean ret = false;\r
         GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilepath));\r
     public boolean downloadFile(String remoteFilepath, File targetPath) {\r
         boolean ret = false;\r
         GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilepath));\r

-        HttpMethodParams params = get.getParams();\r
-        params.setSoTimeout(0); // that means "infinite timeout"; it's the default value, but let's make it explicit\r
-        get.setParams(params);\r

 \r
         // get.setHeader("Host", mUri.getHost());\r
         // get.setHeader("User-Agent", "Android-ownCloud");\r
 \r
         try {\r
 \r
         // get.setHeader("Host", mUri.getHost());\r
         // get.setHeader("User-Agent", "Android-ownCloud");\r
 \r
         try {\r

-            int status = executeMethod(get);\r
+            int status = executeMethod(get, 0);\r

             Log.e(TAG, "status return: " + status);\r
             if (status == HttpStatus.SC_OK) {\r
                 targetPath.createNewFile();\r
             Log.e(TAG, "status return: " + status);\r
             if (status == HttpStatus.SC_OK) {\r
                 targetPath.createNewFile();\r


@@ -197,12 +195,9 @@ public class WebdavClient extends HttpClient {
             entity.setOnDatatransferProgressListener(mDataTransferListener);\r
             Log.e("ASD", f.exists() + " " + entity.getContentLength());\r
             PutMethod put = new PutMethod(mUri.toString() + WebdavUtils.encodePath(remoteTarget));\r
             entity.setOnDatatransferProgressListener(mDataTransferListener);\r
             Log.e("ASD", f.exists() + " " + entity.getContentLength());\r
             PutMethod put = new PutMethod(mUri.toString() + WebdavUtils.encodePath(remoteTarget));\r

-            HttpMethodParams params = put.getParams();\r
-            params.setSoTimeout(0); // that means "infinite timeout"; it's the default value, but let's make it explicit\r
-            put.setParams(params);\r

             put.setRequestEntity(entity);\r
             Log.d(TAG, "" + put.getURI().toString());\r
             put.setRequestEntity(entity);\r
             Log.d(TAG, "" + put.getURI().toString());\r

-            int status = executeMethod(put);\r
+            int status = executeMethod(put, 0);\r

             Log.d(TAG, "PUT method return with status " + status);\r
 \r
             Log.i(TAG, "Uploading, done");\r
             Log.d(TAG, "PUT method return with status " + status);\r
 \r
             Log.i(TAG, "Uploading, done");\r


@@ -253,4 +248,31 @@ public class WebdavClient extends HttpClient {
         }\r
         return true;\r
     }\r
         }\r
         return true;\r
     }\r

+\r
+\r
+    /**\r
+     * Requests the received method with the received timeout (milliseconds).\r
+     * \r
+     * Executes the method through the inherited HttpClient.executedMethod(method).\r
+     * \r
+     * Sets the socket timeout for the HttpMethodBase method received.\r
+     * \r
+     * @param method    HTTP method request.\r
+     * @param timeout   Timeout to set, in milliseconds; <= 0 means infinite.\r
+     */\r
+    public int executeMethod(HttpMethodBase method, int readTimeout) throws HttpException, IOException {\r
+        int oldSoTimeout = getParams().getSoTimeout();\r
+        try {\r
+            if (readTimeout < 0) { \r
+                readTimeout = 0;\r
+            }\r
+            HttpMethodParams params = method.getParams();\r
+            params.setSoTimeout(readTimeout);       \r
+            method.setParams(params);               // this should be enough...\r
+            getParams().setSoTimeout(readTimeout);  // ... but this is necessary for HTTPS\r
+            return executeMethod(method);\r
+        } finally {\r
+            getParams().setSoTimeout(oldSoTimeout);\r
+        }\r
+    }\r

 }\r
 }\r

diff --git a/src/eu/alefzero/webdav/WebdavUtils.java b/src/eu/alefzero/webdav/WebdavUtils.java
index b6c0f2e..a42b902 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavUtils.java
+++ b/src/eu/alefzero/webdav/WebdavUtils.java
@@ -23,8 +23,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
 import java.util.Date;
 import java.util.Locale;
 

-import eu.alefzero.owncloud.datamodel.OCFile;
-

 import android.net.Uri;
 
 public class WebdavUtils {
 import android.net.Uri;
 
 public class WebdavUtils {


@@ -74,4 +72,5 @@ public class WebdavUtils {
             encodedPath = "/" + encodedPath;
         return encodedPath;
     }
             encodedPath = "/" + encodedPath;
         return encodedPath;
     }

+    

 }
 }