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

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index a1dbd098..dd3b4eae 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -21,10 +21,12 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.HashMap;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.commons.httpclient.HttpVersion;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -33,6 +35,7 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.http.HttpStatus;
+import org.apache.http.params.CoreProtocolPNames;
 import org.apache.jackrabbit.webdav.client.methods.DavMethod;
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
@@ -54,7 +57,16 @@ public class WebdavClient extends HttpClient {
     final private static String TAG = "WebdavClient";
     private static final String USER_AGENT = "Android-ownCloud";
     private OnDatatransferProgressListener mDataTransferListener;
-    private static HashMap<String, WebdavClient> clients = new HashMap<String, WebdavClient>();
+    static private MultiThreadedHttpConnectionManager mConnManager = null;
+    
+    static public MultiThreadedHttpConnectionManager getMultiThreadedConnManager() {
+        if (mConnManager == null) {
+            mConnManager = new MultiThreadedHttpConnectionManager();
+            mConnManager.setMaxConnectionsPerHost(5);
+            mConnManager.setMaxTotalConnections(5);
+        }
+        return mConnManager;
+    }
     
     /**
      * Creates a WebdavClient setup for the current account
@@ -62,7 +74,7 @@ public class WebdavClient extends HttpClient {
      * @param context The application context
      * @return
      */
-    public WebdavClient (Account account, Context context){
+    public WebdavClient (Account account, Context context) {
         OwnCloudVersion ownCloudVersion = new OwnCloudVersion(AccountManager.get(context).getUserData(account,
                 AccountAuthenticator.KEY_OC_VERSION));
         String baseUrl = AccountManager.get(context).getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);
@@ -71,15 +83,20 @@ public class WebdavClient extends HttpClient {
         String password = AccountManager.get(context).getPassword(account);
         
         mUri = Uri.parse(baseUrl + webDavPath);
-        getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);
+
         setCredentials(username, password);
-        allowSelfsignedCertificates();
     }
     
-    public WebdavClient(){}
+    public WebdavClient() {
+        super(getMultiThreadedConnManager());
+        
+        getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);
+        getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
+        allowSelfsignedCertificates();
+    }
 
     public void setCredentials(String username, String password) {
-        getParams().setAuthenticationPreemptive(true);
+        //getParams().setAuthenticationPreemptive(true);
         getState().setCredentials(AuthScope.ANY,
                 getCredentials(username, password));
     }
@@ -97,21 +114,11 @@ 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"));
-        */
+        boolean ret = false;
         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");
@@ -119,26 +126,28 @@ public class WebdavClient extends HttpClient {
         try {
             int status = executeMethod(get);
             Log.e(TAG, "status return: " + status);
-            if (status != HttpStatus.SC_OK) {
-                return false;
-            }
-            BufferedInputStream bis = new BufferedInputStream(
-                    get.getResponseBodyAsStream());
-            FileOutputStream fos = new FileOutputStream(targetPath);
-
-            byte[] bytes = new byte[4096];
-            int readResult;
-            while ((readResult = bis.read(bytes)) != -1) {
-                if (mDataTransferListener != null)
-                    mDataTransferListener.transferProgress(readResult);
-                fos.write(bytes, 0, readResult);
+            if (status == HttpStatus.SC_OK) {
+                targetPath.createNewFile();
+                BufferedInputStream bis = new BufferedInputStream(
+                        get.getResponseBodyAsStream());
+                FileOutputStream fos = new FileOutputStream(targetPath);
+
+                byte[] bytes = new byte[4096];
+                int readResult;
+                while ((readResult = bis.read(bytes)) != -1) {
+                    if (mDataTransferListener != null)
+                        mDataTransferListener.transferProgress(readResult);
+                    fos.write(bytes, 0, readResult);
+                }
+                
             }
-
-        } catch (IOException e) {
+            ret = true;
+        } catch (Throwable e) {
             e.printStackTrace();
-            return false;
+            targetPath.delete();
         }
-        return true;
+        
+        return ret;
     }
     
     /**
@@ -172,6 +181,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);