More fixes to PIN Code

[pub/Android/ownCloud.git] / src / eu / alefzero / webdav / WebdavClient.java

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 907de67..dd3b4ea 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -24,6 +24,9 @@ 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.HttpVersion;\r
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;\r

 import org.apache.commons.httpclient.UsernamePasswordCredentials;\r
 import org.apache.commons.httpclient.auth.AuthScope;\r
 import org.apache.commons.httpclient.methods.GetMethod;\r
 import org.apache.commons.httpclient.UsernamePasswordCredentials;\r
 import org.apache.commons.httpclient.auth.AuthScope;\r
 import org.apache.commons.httpclient.methods.GetMethod;\r


@@ -32,13 +35,21 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.params.HttpMethodParams;\r
 import org.apache.commons.httpclient.protocol.Protocol;\r
 import org.apache.http.HttpStatus;\r
 import org.apache.commons.httpclient.params.HttpMethodParams;\r
 import org.apache.commons.httpclient.protocol.Protocol;\r
 import org.apache.http.HttpStatus;\r

+import org.apache.http.params.CoreProtocolPNames;\r
+import org.apache.jackrabbit.webdav.client.methods.DavMethod;\r
+import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;\r

 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;\r
 \r
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;\r
 \r

-import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory;\r
-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;\r
-\r
+import android.accounts.Account;\r
+import android.accounts.AccountManager;\r
+import android.content.Context;\r

 import android.net.Uri;\r
 import android.util.Log;\r
 import android.net.Uri;\r
 import android.util.Log;\r

+import eu.alefzero.owncloud.AccountUtils;\r
+import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
+import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory;\r
+import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;\r
+import eu.alefzero.owncloud.utils.OwnCloudVersion;\r

 \r
 public class WebdavClient extends HttpClient {\r
     private Uri mUri;\r
 \r
 public class WebdavClient extends HttpClient {\r
     private Uri mUri;\r


@@ -46,14 +57,46 @@ public class WebdavClient extends HttpClient {
     final private static String TAG = "WebdavClient";\r
     private static final String USER_AGENT = "Android-ownCloud";\r
     private OnDatatransferProgressListener mDataTransferListener;\r
     final private static String TAG = "WebdavClient";\r
     private static final String USER_AGENT = "Android-ownCloud";\r
     private OnDatatransferProgressListener mDataTransferListener;\r

+    static private MultiThreadedHttpConnectionManager mConnManager = null;\r
+    \r
+    static public MultiThreadedHttpConnectionManager getMultiThreadedConnManager() {\r
+        if (mConnManager == null) {\r
+            mConnManager = new MultiThreadedHttpConnectionManager();\r
+            mConnManager.setMaxConnectionsPerHost(5);\r
+            mConnManager.setMaxTotalConnections(5);\r
+        }\r
+        return mConnManager;\r
+    }\r
+    \r
+    /**\r
+     * Creates a WebdavClient setup for the current account\r
+     * @param account The client accout\r
+     * @param context The application context\r
+     * @return\r
+     */\r
+    public WebdavClient (Account account, Context context) {\r
+        OwnCloudVersion ownCloudVersion = new OwnCloudVersion(AccountManager.get(context).getUserData(account,\r
+                AccountAuthenticator.KEY_OC_VERSION));\r
+        String baseUrl = AccountManager.get(context).getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);\r
+        String webDavPath = AccountUtils.getWebdavPath(ownCloudVersion);        \r
+        String username = account.name.substring(0, account.name.indexOf('@'));\r
+        String password = AccountManager.get(context).getPassword(account);\r
+        \r
+        mUri = Uri.parse(baseUrl + webDavPath);\r

 \r
 \r

-    public WebdavClient(Uri uri) {\r
-        mUri = uri;\r
+        setCredentials(username, password);\r
+    }\r
+    \r
+    public WebdavClient() {\r
+        super(getMultiThreadedConnManager());\r
+        \r

         getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);\r
         getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);\r

+        getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);\r
+        allowSelfsignedCertificates();\r

     }\r
 \r
     public void setCredentials(String username, String password) {\r
     }\r
 \r
     public void setCredentials(String username, String password) {\r

-        getParams().setAuthenticationPreemptive(true);\r
+        //getParams().setAuthenticationPreemptive(true);\r

         getState().setCredentials(AuthScope.ANY,\r
                 getCredentials(username, password));\r
     }\r
         getState().setCredentials(AuthScope.ANY,\r
                 getCredentials(username, password));\r
     }\r


@@ -71,22 +114,11 @@ public class WebdavClient extends HttpClient {
     }\r
 \r
     public boolean downloadFile(String remoteFilepath, File targetPath) {\r
     }\r
 \r
     public boolean downloadFile(String remoteFilepath, File targetPath) {\r

-        // HttpGet get = new HttpGet(mUri.toString() + filepath.replace(" ",\r
-        // "%20"));\r
-        /* dvelasco - this is not necessary anymore; OCFile.mRemotePath (the origin of remoteFielPath) keeps valid URL strings\r
-        String[] splitted_filepath = remoteFilepath.split("/");\r
-        remoteFilepath = "";\r
-        for (String s : splitted_filepath) {\r
-            if (s.equals("")) continue;\r
-            remoteFilepath += "/" + URLEncoder.encode(s);\r
-        }\r
-\r
-        Log.e("ASD", mUri.toString() + remoteFilepath.replace(" ", "%20") + "");\r
-        GetMethod get = new GetMethod(mUri.toString()\r
-                + remoteFilepath.replace(" ", "%20"));\r
-        */\r
-        \r
+        boolean ret = false;\r

         GetMethod get = new GetMethod(mUri.toString() + remoteFilepath);\r
         GetMethod get = new GetMethod(mUri.toString() + 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
         // get.setHeader("Host", mUri.getHost());\r
         // get.setHeader("User-Agent", "Android-ownCloud");\r


@@ -94,23 +126,41 @@ public class WebdavClient extends HttpClient {
         try {\r
             int status = executeMethod(get);\r
             Log.e(TAG, "status return: " + status);\r
         try {\r
             int status = executeMethod(get);\r
             Log.e(TAG, "status return: " + status);\r

-            if (status != HttpStatus.SC_OK) {\r
-                return false;\r
-            }\r
-            BufferedInputStream bis = new BufferedInputStream(\r
-                    get.getResponseBodyAsStream());\r
-            FileOutputStream fos = new FileOutputStream(targetPath);\r
-\r
-            byte[] bytes = new byte[4096];\r
-            int readResult;\r
-            while ((readResult = bis.read(bytes)) != -1) {\r
-                if (mDataTransferListener != null)\r
-                    mDataTransferListener.transferProgress(readResult);\r
-                fos.write(bytes, 0, readResult);\r
+            if (status == HttpStatus.SC_OK) {\r
+                targetPath.createNewFile();\r
+                BufferedInputStream bis = new BufferedInputStream(\r
+                        get.getResponseBodyAsStream());\r
+                FileOutputStream fos = new FileOutputStream(targetPath);\r
+\r
+                byte[] bytes = new byte[4096];\r
+                int readResult;\r
+                while ((readResult = bis.read(bytes)) != -1) {\r
+                    if (mDataTransferListener != null)\r
+                        mDataTransferListener.transferProgress(readResult);\r
+                    fos.write(bytes, 0, readResult);\r
+                }\r
+                \r

             }\r
             }\r

-\r
-        } catch (IOException e) {\r
+            ret = true;\r
+        } catch (Throwable e) {\r

             e.printStackTrace();\r
             e.printStackTrace();\r

+            targetPath.delete();\r
+        }\r
+        \r
+        return ret;\r
+    }\r
+    \r
+    /**\r
+     * Deletes a remote file via webdav\r
+     * @param remoteFilePath\r
+     * @return\r
+     */\r
+    public boolean deleteFile(String remoteFilePath){\r
+        DavMethod delete = new DeleteMethod(mUri.toString() + remoteFilePath);\r
+        try {\r
+            executeMethod(delete);\r
+        }  catch (Throwable e) {\r
+            Log.e(TAG, "Deleting failed with error: " + e.getMessage(), e);\r

             return false;\r
         }\r
         return true;\r
             return false;\r
         }\r
         return true;\r


@@ -131,6 +181,9 @@ public class WebdavClient extends HttpClient {
             entity.setOnDatatransferProgressListener(mDataTransferListener);\r
             Log.e("ASD", f.exists() + " " + entity.getContentLength());\r
             PutMethod put = new PutMethod(mUri.toString() + remoteTarget);\r
             entity.setOnDatatransferProgressListener(mDataTransferListener);\r
             Log.e("ASD", f.exists() + " " + entity.getContentLength());\r
             PutMethod put = new PutMethod(mUri.toString() + 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
             int status = executeMethod(put);\r
             put.setRequestEntity(entity);\r
             Log.d(TAG, "" + put.getURI().toString());\r
             int status = executeMethod(put);\r


@@ -145,15 +198,24 @@ public class WebdavClient extends HttpClient {
         return result;\r
     }\r
 \r
         return result;\r
     }\r
 \r

-    public int tryToLogin() {\r
-        int r = 0;\r
-        HeadMethod head = new HeadMethod(mUri.toString());\r
+    /**\r
+     * Tries to log in to the given WedDavURI, with the given credentials\r
+     * @param uri To test\r
+     * @param username Username to check\r
+     * @param password Password to verify\r
+     * @return A {@link HttpStatus}-Code of the result. SC_OK is good.\r
+     */\r
+    public static int tryToLogin(Uri uri, String username, String password) {\r
+        int returnCode = 0;\r
+        WebdavClient client = new WebdavClient();\r
+        client.setCredentials(username, password);\r
+        HeadMethod head = new HeadMethod(uri.toString());\r

         try {\r
         try {\r

-            r = executeMethod(head);\r
+            returnCode = client.executeMethod(head);\r

         } catch (Exception e) {\r
             Log.e(TAG, "Error: " + e.getMessage());\r
         }\r
         } catch (Exception e) {\r
             Log.e(TAG, "Error: " + e.getMessage());\r
         }\r

-        return r;\r
+        return returnCode;\r

     }\r
 \r
     public boolean createDirectory(String path) {\r
     }\r
 \r
     public boolean createDirectory(String path) {\r