X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c6b553f635c7cbb4f21d41a6fa82e204447c16cf..ff0803c3eead5a8b42b9a6f3fc4d351be076c081:/src/eu/alefzero/webdav/WebdavClient.java

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 9eafddc1..a5398000 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -24,7 +24,8 @@ import java.io.IOException;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.HttpVersion;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
@@ -96,7 +97,7 @@ public class WebdavClient extends HttpClient {
     }
 
     public void setCredentials(String username, String password) {
-        //getParams().setAuthenticationPreemptive(true);
+        getParams().setAuthenticationPreemptive(true);
         getState().setCredentials(AuthScope.ANY,
                 getCredentials(username, password));
     }
@@ -122,16 +123,13 @@ public class WebdavClient extends HttpClient {
      */
     public boolean downloadFile(String remoteFilepath, File targetPath) {
         boolean ret = false;
-        GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encode(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);
+        GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilepath));
 
         // get.setHeader("Host", mUri.getHost());
         // get.setHeader("User-Agent", "Android-ownCloud");
 
         try {
-            int status = executeMethod(get);
+            int status = executeMethod(get, 0);
             Log.e(TAG, "status return: " + status);
             if (status == HttpStatus.SC_OK) {
                 targetPath.createNewFile();
@@ -146,9 +144,9 @@ public class WebdavClient extends HttpClient {
                         mDataTransferListener.transferProgress(readResult);
                     fos.write(bytes, 0, readResult);
                 }
-                
+                ret = true;
             }
-            ret = true;
+            
         } catch (Throwable e) {
             e.printStackTrace();
             targetPath.delete();
@@ -163,7 +161,7 @@ public class WebdavClient extends HttpClient {
      * @return
      */
     public boolean deleteFile(String remoteFilePath){
-        DavMethod delete = new DeleteMethod(mUri.toString() + WebdavUtils.encode(remoteFilePath));
+        DavMethod delete = new DeleteMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilePath));
         try {
             executeMethod(delete);
         }  catch (Throwable e) {
@@ -196,13 +194,10 @@ public class WebdavClient extends HttpClient {
             FileRequestEntity entity = new FileRequestEntity(f, contentType);
             entity.setOnDatatransferProgressListener(mDataTransferListener);
             Log.e("ASD", f.exists() + " " + entity.getContentLength());
-            PutMethod put = new PutMethod(mUri.toString() + WebdavUtils.encode(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);
+            PutMethod put = new PutMethod(mUri.toString() + WebdavUtils.encodePath(remoteTarget));
             put.setRequestEntity(entity);
             Log.d(TAG, "" + put.getURI().toString());
-            int status = executeMethod(put);
+            int status = executeMethod(put, 0);
             Log.d(TAG, "PUT method return with status " + status);
 
             Log.i(TAG, "Uploading, done");
@@ -242,7 +237,7 @@ public class WebdavClient extends HttpClient {
      */
     public boolean createDirectory(String path) {
         try {
-            MkColMethod mkcol = new MkColMethod(mUri.toString() + WebdavUtils.encode(path));
+            MkColMethod mkcol = new MkColMethod(mUri.toString() + WebdavUtils.encodePath(path));
             int status = executeMethod(mkcol);
             Log.d(TAG, "Status returned " + status);
             Log.d(TAG, "uri: " + mkcol.getURI().toString());
@@ -253,4 +248,31 @@ public class WebdavClient extends HttpClient {
         }
         return true;
     }
+
+
+    /**
+     * Requests the received method with the received timeout (milliseconds).
+     * 
+     * Executes the method through the inherited HttpClient.executedMethod(method).
+     * 
+     * Sets the socket timeout for the HttpMethodBase method received.
+     * 
+     * @param method    HTTP method request.
+     * @param timeout   Timeout to set, in milliseconds; <= 0 means infinite.
+     */
+    public int executeMethod(HttpMethodBase method, int readTimeout) throws HttpException, IOException {
+        int oldSoTimeout = getParams().getSoTimeout();
+        try {
+            if (readTimeout < 0) { 
+                readTimeout = 0;
+            }
+            HttpMethodParams params = method.getParams();
+            params.setSoTimeout(readTimeout);       
+            method.setParams(params);               // this should be enough...
+            getParams().setSoTimeout(readTimeout);  // ... but this is necessary for HTTPS
+            return executeMethod(method);
+        } finally {
+            getParams().setSoTimeout(oldSoTimeout);
+        }
+    }
 }