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

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / fragment / FileDetailFragment.java

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