X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/eb1c63d3dc5294e2ff7a7d2c32d762fd25286223..9b9b02c384b4453b3debd703c52e24b6136540f8:/src/eu/alefzero/webdav/WebdavClient.java?ds=sidebyside

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 3ed86c17..fd1ec504 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -38,17 +37,16 @@ import org.apache.jackrabbit.webdav.client.methods.DavMethod;
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
 
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory;
-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
+import eu.alefzero.owncloud.AccountUtils;
+import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
+import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory;
+import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
+import eu.alefzero.owncloud.utils.OwnCloudVersion;
 
 public class WebdavClient extends HttpClient {
     private Uri mUri;
@@ -99,21 +97,10 @@ public class WebdavClient extends HttpClient {
     }
 
     public boolean downloadFile(String remoteFilepath, File targetPath) {
-        // HttpGet get = new HttpGet(mUri.toString() + filepath.replace(" ",
-        // "%20"));
-        /* dvelasco - this is not necessary anymore; OCFile.mRemotePath (the origin of remoteFielPath) keeps valid URL strings
-        String[] splitted_filepath = remoteFilepath.split("/");
-        remoteFilepath = "";
-        for (String s : splitted_filepath) {
-            if (s.equals("")) continue;
-            remoteFilepath += "/" + URLEncoder.encode(s);
-        }
-
-        Log.e("ASD", mUri.toString() + remoteFilepath.replace(" ", "%20") + "");
-        GetMethod get = new GetMethod(mUri.toString()
-                + remoteFilepath.replace(" ", "%20"));
-        */
         GetMethod get = new GetMethod(mUri.toString() + remoteFilepath);
+        HttpMethodParams params = get.getParams();
+        params.setSoTimeout(0); // that means "infinite timeout"; it's the default value, but let's make it explicit
+        get.setParams(params);
 
         // get.setHeader("Host", mUri.getHost());
         // get.setHeader("User-Agent", "Android-ownCloud");
@@ -152,8 +139,8 @@ public class WebdavClient extends HttpClient {
         DavMethod delete = new DeleteMethod(mUri.toString() + remoteFilePath);
         try {
             executeMethod(delete);
-        }  catch (IOException e) {
-            Log.e(TAG, "Logging failed with error: " + e.getMessage(), e);
+        }  catch (Throwable e) {
+            Log.e(TAG, "Deleting failed with error: " + e.getMessage(), e);
             return false;
         }
         return true;
@@ -174,6 +161,9 @@ public class WebdavClient extends HttpClient {
             entity.setOnDatatransferProgressListener(mDataTransferListener);
             Log.e("ASD", f.exists() + " " + entity.getContentLength());
             PutMethod put = new PutMethod(mUri.toString() + remoteTarget);
+            HttpMethodParams params = put.getParams();
+            params.setSoTimeout(0); // that means "infinite timeout"; it's the default value, but let's make it explicit
+            put.setParams(params);
             put.setRequestEntity(entity);
             Log.d(TAG, "" + put.getURI().toString());
             int status = executeMethod(put);