Make the OAuth authorization available or not depending upon a variable in oauth.xml

[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 1135daf..7577152 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application\r
  *   Copyright (C) 2011  Bartek Przybylski\r
 /* ownCloud Android client application\r
  *   Copyright (C) 2011  Bartek Przybylski\r

+ *   Copyright (C) 2012-2013 ownCloud Inc.\r

  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License as published by\r
  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License as published by\r

- *   the Free Software Foundation, either version 3 of the License, or\r
+ *   the Free Software Foundation, either version 2 of the License, or\r

  *   (at your option) any later version.\r
  *\r
  *   This program is distributed in the hope that it will be useful,\r
  *   (at your option) any later version.\r
  *\r
  *   This program is distributed in the hope that it will be useful,\r


@@ -21,36 +22,36 @@ import java.io.BufferedInputStream;
 import java.io.File;\r
 import java.io.FileOutputStream;\r
 import java.io.IOException;\r
 import java.io.File;\r
 import java.io.FileOutputStream;\r
 import java.io.IOException;\r

+import java.io.InputStream;\r
+import java.util.ArrayList;\r
+import java.util.List;\r

 \r
 import org.apache.commons.httpclient.Credentials;\r
 \r
 import org.apache.commons.httpclient.Credentials;\r

+import org.apache.commons.httpclient.HostConfiguration;\r

 import org.apache.commons.httpclient.HttpClient;\r
 import org.apache.commons.httpclient.HttpClient;\r

+import org.apache.commons.httpclient.HttpConnectionManager;\r

 import org.apache.commons.httpclient.HttpException;\r
 import org.apache.commons.httpclient.HttpException;\r

+import org.apache.commons.httpclient.HttpMethod;\r

 import org.apache.commons.httpclient.HttpMethodBase;\r
 import org.apache.commons.httpclient.HttpMethodBase;\r

+import org.apache.commons.httpclient.HttpState;\r

 import org.apache.commons.httpclient.HttpVersion;\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.UsernamePasswordCredentials;\r

+import org.apache.commons.httpclient.auth.AuthPolicy;\r

 import org.apache.commons.httpclient.auth.AuthScope;\r
 import org.apache.commons.httpclient.methods.GetMethod;\r
 import org.apache.commons.httpclient.methods.HeadMethod;\r
 import org.apache.commons.httpclient.methods.PutMethod;\r
 import org.apache.commons.httpclient.params.HttpMethodParams;\r
 import org.apache.commons.httpclient.auth.AuthScope;\r
 import org.apache.commons.httpclient.methods.GetMethod;\r
 import org.apache.commons.httpclient.methods.HeadMethod;\r
 import org.apache.commons.httpclient.methods.PutMethod;\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.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
 \r

-import android.accounts.Account;\r
-import android.accounts.AccountManager;\r
-import android.content.Context;\r
+import com.owncloud.android.network.BearerAuthScheme;\r
+import com.owncloud.android.network.BearerCredentials;\r
+\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


@@ -58,81 +59,41 @@ public class WebdavClient extends HttpClient {
     final private static String TAG = "WebdavClient";\r
     private static final String USER_AGENT = "Android-ownCloud";\r
     \r
     final private static String TAG = "WebdavClient";\r
     private static final String USER_AGENT = "Android-ownCloud";\r
     \r

-    /** Default timeout for waiting data from the server: 10 seconds */\r
-    public static final int DEFAULT_DATA_TIMEOUT = 10000;\r
-    \r
-    /** Default timeout for establishing a connection: infinite */\r
-    public static final int DEFAULT_CONNECTION_TIMEOUT = 0;\r
-    \r

     private OnDatatransferProgressListener mDataTransferListener;\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
+    static private byte[] sExhaustBuffer = new byte[1024];\r

     \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
+     * Constructor\r

      */\r
      */\r

-    public WebdavClient (Account account, Context context) {\r
-        setDefaultTimeouts();\r
-        \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.lastIndexOf('@'));\r
-        String password = AccountManager.get(context).getPassword(account);\r
-        \r
-        mUri = Uri.parse(baseUrl + webDavPath);\r
-        Log.e("ASD", ""+username);\r
-        setCredentials(username, password);\r
-    }\r
-    \r
-    public WebdavClient() {\r
-        super(getMultiThreadedConnManager());\r
-        \r
-        setDefaultTimeouts();\r
-        \r
+    public WebdavClient(HttpConnectionManager connectionMgr) {\r
+        super(connectionMgr);\r
+        Log.d(TAG, "Creating WebdavClient");\r

         getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);\r
         getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);\r
         getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);\r
         getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);\r

-        allowSelfsignedCertificates();\r

     }\r
 \r
     }\r
 \r

-    public void setCredentials(String username, String password) {\r
-        getParams().setAuthenticationPreemptive(true);\r
-        getState().setCredentials(AuthScope.ANY,\r
-                getCredentials(username, password));\r
+    public void setBearerCredentials(String accessToken) {\r
+        AuthPolicy.registerAuthScheme(BearerAuthScheme.AUTH_POLICY, BearerAuthScheme.class);\r
+        \r
+        List<String> authPrefs = new ArrayList<String>(1);\r
+        authPrefs.add(BearerAuthScheme.AUTH_POLICY);\r
+        getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);        \r
+        \r
+        mCredentials = new BearerCredentials(accessToken);\r
+        getState().setCredentials(AuthScope.ANY, mCredentials);\r

     }\r
 \r
     }\r
 \r

-    private Credentials getCredentials(String username, String password) {\r
-        if (mCredentials == null)\r
-            mCredentials = new UsernamePasswordCredentials(username, password);\r
-        return mCredentials;\r
+    public void setBasicCredentials(String username, String password) {\r
+        List<String> authPrefs = new ArrayList<String>(1);\r
+        authPrefs.add(AuthPolicy.BASIC);\r
+        getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);        \r
+        \r
+        getParams().setAuthenticationPreemptive(true);\r
+        mCredentials = new UsernamePasswordCredentials(username, password);\r
+        getState().setCredentials(AuthScope.ANY, mCredentials);\r

     }\r
     \r
     }\r
     \r

-    /**\r
-     * Sets the connection and wait-for-data timeouts to be applied by default.\r
-     */\r
-    private void setDefaultTimeouts() {\r
-        getParams().setSoTimeout(DEFAULT_DATA_TIMEOUT);\r
-        getHttpConnectionManager().getParams().setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);\r
-    }\r
-\r
-    public void allowSelfsignedCertificates() {\r
-        // https\r
-        Protocol.registerProtocol("https", new Protocol("https",\r
-                new EasySSLSocketFactory(), 443));\r
-    }\r
-\r
+    \r

     /**\r
      * Downloads a file in remoteFilepath to the local targetPath.\r
      * \r
     /**\r
      * Downloads a file in remoteFilepath to the local targetPath.\r
      * \r


@@ -140,13 +101,12 @@ public class WebdavClient extends HttpClient {
      * @param targetFile        Local path to save the downloaded file.\r
      * @return                  'True' when the file is successfully downloaded.\r
      */\r
      * @param targetFile        Local path to save the downloaded file.\r
      * @return                  'True' when the file is successfully downloaded.\r
      */\r

-    public boolean downloadFile(String remoteFilepath, File targetFile) {\r
+    public boolean downloadFile(String remoteFilePath, File targetFile) {\r

         boolean ret = false;\r
         boolean ret = false;\r

-        GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilepath));\r
+        GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilePath));\r

 \r
 \r

-        int status = -1;\r

         try {\r
         try {\r

-            status = executeMethod(get);\r
+            int status = executeMethod(get);\r

             if (status == HttpStatus.SC_OK) {\r
                 targetFile.createNewFile();\r
                 BufferedInputStream bis = new BufferedInputStream(\r
             if (status == HttpStatus.SC_OK) {\r
                 targetFile.createNewFile();\r
                 BufferedInputStream bis = new BufferedInputStream(\r


@@ -157,30 +117,23 @@ public class WebdavClient extends HttpClient {
                 int readResult;\r
                 while ((readResult = bis.read(bytes)) != -1) {\r
                     if (mDataTransferListener != null)\r
                 int readResult;\r
                 while ((readResult = bis.read(bytes)) != -1) {\r
                     if (mDataTransferListener != null)\r

-                        mDataTransferListener.transferProgress(readResult);\r
+                        mDataTransferListener.onTransferProgress(readResult);\r

                     fos.write(bytes, 0, readResult);\r
                 }\r
                     fos.write(bytes, 0, readResult);\r
                 }\r

+                fos.close();\r

                 ret = true;\r
                 ret = true;\r

+            } else {\r
+                exhaustResponse(get.getResponseBodyAsStream());\r

             }\r
             }\r

-            \r
-        } catch (HttpException e) {\r
-            Log.e(TAG, "HTTP exception downloading " + remoteFilepath, e);\r
-\r
-        } catch (IOException e) {\r
-            Log.e(TAG, "I/O exception downloading " + remoteFilepath, e);\r
-\r
+            Log.e(TAG, "Download of " + remoteFilePath + " to " + targetFile + " finished with HTTP status " + status + (!ret?"(FAIL)":""));\r

         } catch (Exception e) {\r
         } catch (Exception e) {\r

-            Log.e(TAG, "Unexpected exception downloading " + remoteFilepath, e);\r
+            logException(e, "dowloading " + remoteFilePath);\r

             \r
         } finally {\r
             \r
         } finally {\r

-            if (!ret) {\r
-                if (status >= 0) {\r
-                    Log.e(TAG, "Download of " + remoteFilepath + " to " + targetFile + " failed with HTTP status " + status);\r
-                }\r
-                if (targetFile.exists()) {\r
-                    targetFile.delete();\r
-                }\r
+            if (!ret && targetFile.exists()) {\r
+                targetFile.delete();\r

             }\r
             }\r

+            get.releaseConnection();    // let the connection available for other methods\r

         }\r
         return ret;\r
     }\r
         }\r
         return ret;\r
     }\r


@@ -190,17 +143,26 @@ public class WebdavClient extends HttpClient {
      * @param remoteFilePath       Remote file path of the file to delete, in URL DECODED format.\r
      * @return\r
      */\r
      * @param remoteFilePath       Remote file path of the file to delete, in URL DECODED format.\r
      * @return\r
      */\r

-    public boolean deleteFile(String remoteFilePath){\r
+    public boolean deleteFile(String remoteFilePath) {\r
+        boolean ret = false;\r

         DavMethod delete = new DeleteMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilePath));\r
         try {\r
         DavMethod delete = new DeleteMethod(mUri.toString() + WebdavUtils.encodePath(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
+            int status = executeMethod(delete);\r
+            ret = (status == HttpStatus.SC_OK || status == HttpStatus.SC_ACCEPTED || status == HttpStatus.SC_NO_CONTENT);\r
+            exhaustResponse(delete.getResponseBodyAsStream());\r
+            \r
+            Log.e(TAG, "DELETE of " + remoteFilePath + " finished with HTTP status " + status +  (!ret?"(FAIL)":""));\r
+            \r
+        } catch (Exception e) {\r
+            logException(e, "deleting " + remoteFilePath);\r
+            \r
+        } finally {\r
+            delete.releaseConnection();    // let the connection available for other methods\r

         }\r
         }\r

-        return true;\r
+        return ret;\r

     }\r
 \r
     }\r
 \r

+    \r

     public void setDataTransferProgressListener(OnDatatransferProgressListener listener) {\r
         mDataTransferListener = listener;\r
     }\r
     public void setDataTransferProgressListener(OnDatatransferProgressListener listener) {\r
         mDataTransferListener = listener;\r
     }\r


@@ -208,113 +170,72 @@ public class WebdavClient extends HttpClient {
     /**\r
      * Creates or update a file in the remote server with the contents of a local file.\r
      * \r
     /**\r
      * Creates or update a file in the remote server with the contents of a local file.\r
      * \r

-     * \r

      * @param localFile         Path to the local file to upload.\r
      * @param remoteTarget      Remote path to the file to create or update, URL DECODED\r
      * @param contentType       MIME type of the file.\r
      * @param localFile         Path to the local file to upload.\r
      * @param remoteTarget      Remote path to the file to create or update, URL DECODED\r
      * @param contentType       MIME type of the file.\r

-     * @return                  'True' then the upload was successfully completed\r
+     * @return                  Status HTTP code returned by the server.\r
+     * @throws IOException      When a transport error that could not be recovered occurred while uploading the file to the server.\r
+     * @throws HttpException    When a violation of the HTTP protocol occurred. \r

      */\r
      */\r

-    public boolean putFile(String localFile, String remoteTarget, String contentType) {\r
-        boolean result = false;\r
+    public int putFile(String localFile, String remoteTarget, String contentType) throws HttpException, IOException {\r

         int status = -1;\r
         int status = -1;\r

-\r
+        PutMethod put = new PutMethod(mUri.toString() + WebdavUtils.encodePath(remoteTarget));\r
+        \r

         try {\r
             File f = new File(localFile);\r
             FileRequestEntity entity = new FileRequestEntity(f, contentType);\r
         try {\r
             File f = new File(localFile);\r
             FileRequestEntity entity = new FileRequestEntity(f, contentType);\r

-            entity.setOnDatatransferProgressListener(mDataTransferListener);\r
-            PutMethod put = new PutMethod(mUri.toString() + WebdavUtils.encodePath(remoteTarget));\r
+            entity.addOnDatatransferProgressListener(mDataTransferListener);\r

             put.setRequestEntity(entity);\r
             status = executeMethod(put);\r
             \r
             put.setRequestEntity(entity);\r
             status = executeMethod(put);\r
             \r

-            result = (status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT);\r
-            \r
-            Log.d(TAG, "PUT response for " + remoteTarget + " finished with HTTP status " + status);\r
+            exhaustResponse(put.getResponseBodyAsStream());\r

             \r
             \r

-        } catch (HttpException e) {\r
-            Log.e(TAG, "HTTP exception uploading " + localFile + " to " + remoteTarget, e);\r
-\r
-        } catch (IOException e) {\r
-            Log.e(TAG, "I/O exception uploading " + localFile + " to " + remoteTarget, e);\r
-\r
-        } catch (Exception e) {\r
-            Log.e(TAG, "Unexpected exception uploading " + localFile + " to " + remoteTarget, e);\r
-        }\r
-        \r
-        if (!result && status >= 0) Log.e(TAG, "Upload of " + localFile + " to " + remoteTarget + " FAILED with HTTP status " + status);\r
-        \r
-        return result;\r
-    }\r
-\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
-            returnCode = client.executeMethod(head);\r
-        } catch (HttpException e) {\r
-            Log.e(TAG, "HTTP exception trying to login at " + uri.getEncodedPath(), e);\r
-        } catch (IOException e) {\r
-            Log.e(TAG, "I/O exception trying to login at " + uri.getEncodedPath(), e);\r
-        } catch (Exception e) {\r
-            Log.e(TAG, "Unexpected exception trying to login at " + uri.getEncodedPath(), e);\r
+        } finally {\r
+            put.releaseConnection();    // let the connection available for other methods\r

         }\r
         }\r

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

     }\r
     }\r

-\r
+    \r

     /**\r
     /**\r

-     * Creates a remote directory with the received path.\r
+     * Tries to log in to the current URI, with the current credentials\r

      * \r
      * \r

-     * @param path      Path of the directory to create, URL DECODED\r
-     * @return          'True' when the directory is successfully created\r
+     * @return A {@link HttpStatus}-Code of the result. SC_OK is good.\r

      */\r
      */\r

-    public boolean createDirectory(String path) {\r
-        boolean result = false;\r
-        int status = -1;\r
+    public int tryToLogin() {\r
+        int status = 0;\r
+        HeadMethod head = new HeadMethod(mUri.toString());\r

         try {\r
         try {\r

-            MkColMethod mkcol = new MkColMethod(mUri.toString() + WebdavUtils.encodePath(path));\r
-            Log.d(TAG, "Creating directory " + path);\r
-            status = executeMethod(mkcol);\r
-            Log.d(TAG, "Status returned: " + status);\r
-            result = mkcol.succeeded();\r
+            status = executeMethod(head);\r
+            boolean result = status == HttpStatus.SC_OK;\r
+            Log.d(TAG, "HEAD for " + mUri + " finished with HTTP status " + status + (!result?"(FAIL)":""));\r
+            exhaustResponse(head.getResponseBodyAsStream());\r

             \r
             \r

-        } catch (HttpException e) {\r
-            Log.e(TAG, "HTTP exception creating directory " + path, e);\r
-\r
-        } catch (IOException e) {\r
-            Log.e(TAG, "I/O exception creating directory " + path, e);\r
-\r

         } catch (Exception e) {\r
         } catch (Exception e) {\r

-            Log.e(TAG, "Unexpected exception creating directory " + path, e);\r
+            logException(e, "trying to login at " + mUri.toString());\r

             \r
             \r

+        } finally {\r
+            head.releaseConnection();\r

         }\r
         }\r

-        if (!result && status >= 0) {\r
-            Log.e(TAG, "Creation of directory " + path + " failed with HTTP status " + status);\r
-        }\r
-        return result;\r
+        return status;\r

     }\r
     }\r

-    \r
+\r

     \r
     /**\r
      * Check if a file exists in the OC server\r
      * \r
     \r
     /**\r
      * Check if a file exists in the OC server\r
      * \r

-     * @return      'Boolean.TRUE' if the file exists; 'Boolean.FALSE' it doesn't exist; NULL if couldn't be checked\r
+     * @return              'true' if the file exists; 'false' it doesn't exist\r
+     * @throws  Exception   When the existence could not be determined\r

      */\r
      */\r

-    public Boolean existsFile(String path) {\r
+    public boolean existsFile(String path) throws IOException, HttpException {\r
+        HeadMethod head = new HeadMethod(mUri.toString() + WebdavUtils.encodePath(path));\r

         try {\r
         try {\r

-            HeadMethod head = new HeadMethod(mUri.toString() + WebdavUtils.encodePath(path));\r

             int status = executeMethod(head);\r
             int status = executeMethod(head);\r

+            Log.d(TAG, "HEAD to " + path + " finished with HTTP status " + status + ((status != HttpStatus.SC_OK)?"(FAIL)":""));\r
+            exhaustResponse(head.getResponseBodyAsStream());\r

             return (status == HttpStatus.SC_OK);\r
             return (status == HttpStatus.SC_OK);\r

-        } catch (Exception e) {\r
-            e.printStackTrace();\r
-            return null;\r
+            \r
+        } finally {\r
+            head.releaseConnection();    // let the connection available for other methods\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r


@@ -324,24 +245,102 @@ public class WebdavClient extends HttpClient {
      * \r
      * Executes the method through the inherited HttpClient.executedMethod(method).\r
      * \r
      * \r
      * Executes the method through the inherited HttpClient.executedMethod(method).\r
      * \r

-     * Sets the socket timeout for the HttpMethodBase method received.\r
+     * Sets the socket and connection timeouts only for the method received.\r

      * \r
      * \r

-     * @param method    HTTP method request.\r
-     * @param timeout   Timeout to set, in milliseconds; <= 0 means infinite.\r
+     * The timeouts are both in milliseconds; 0 means 'infinite'; < 0 means 'do not change the default'\r
+     * \r
+     * @param method            HTTP method request.\r
+     * @param readTimeout       Timeout to set for data reception\r
+     * @param conntionTimout    Timeout to set for connection establishment\r

      */\r
      */\r

-    public int executeMethod(HttpMethodBase method, int readTimeout) throws HttpException, IOException {\r
+    public int executeMethod(HttpMethodBase method, int readTimeout, int connectionTimeout) throws HttpException, IOException {\r

         int oldSoTimeout = getParams().getSoTimeout();\r
         int oldSoTimeout = getParams().getSoTimeout();\r

+        int oldConnectionTimeout = getHttpConnectionManager().getParams().getConnectionTimeout();\r

         try {\r
         try {\r

-            if (readTimeout < 0) { \r
-                readTimeout = 0;\r
+            if (readTimeout >= 0) { \r
+                method.getParams().setSoTimeout(readTimeout);   // this should be enough...\r
+                getParams().setSoTimeout(readTimeout);          // ... but this looks like necessary for HTTPS\r
+            }\r
+            if (connectionTimeout >= 0) {\r
+                getHttpConnectionManager().getParams().setConnectionTimeout(connectionTimeout);\r

             }\r
             }\r

-            HttpMethodParams params = method.getParams();\r
-            params.setSoTimeout(readTimeout);       \r
-            method.setParams(params);               // this should be enough...\r
-            getParams().setSoTimeout(readTimeout);  // ... but this is necessary for HTTPS\r

             return executeMethod(method);\r
         } finally {\r
             getParams().setSoTimeout(oldSoTimeout);\r
             return executeMethod(method);\r
         } finally {\r
             getParams().setSoTimeout(oldSoTimeout);\r

+            getHttpConnectionManager().getParams().setConnectionTimeout(oldConnectionTimeout);\r
+        }\r
+    }\r
+\r
+    /**\r
+     * Exhausts a not interesting HTTP response. Encouraged by HttpClient documentation.\r
+     * \r
+     * @param responseBodyAsStream      InputStream with the HTTP response to exhaust.\r
+     */\r
+    public void exhaustResponse(InputStream responseBodyAsStream) {\r
+        if (responseBodyAsStream != null) {\r
+            try {\r
+                while (responseBodyAsStream.read(sExhaustBuffer) >= 0);\r
+                responseBodyAsStream.close();\r
+            \r
+            } catch (IOException io) {\r
+                Log.e(TAG, "Unexpected exception while exhausting not interesting HTTP response; will be IGNORED", io);\r
+            }\r

         }\r
     }\r
         }\r
     }\r

+\r
+\r
+    /**\r
+     * Logs an exception triggered in a HTTP request. \r
+     * \r
+     * @param e         Caught exception.\r
+     * @param doing     Suffix to add at the end of the logged message.\r
+     */\r
+    private void logException(Exception e, String doing) {\r
+        if (e instanceof HttpException) {\r
+            Log.e(TAG, "HTTP violation while " + doing, e);\r
+\r
+        } else if (e instanceof IOException) {\r
+            Log.e(TAG, "Unrecovered transport exception while " + doing, e);\r
+\r
+        } else {\r
+            Log.e(TAG, "Unexpected exception while " + doing, e);\r
+        }\r
+    }\r
+\r
+    \r
+    /**\r
+     * Sets the connection and wait-for-data timeouts to be applied by default to the methods performed by this client.\r
+     */\r
+    public void setDefaultTimeouts(int defaultDataTimeout, int defaultConnectionTimeout) {\r
+            getParams().setSoTimeout(defaultDataTimeout);\r
+            getHttpConnectionManager().getParams().setConnectionTimeout(defaultConnectionTimeout);\r
+    }\r
+\r
+    /**\r
+     * Sets the base URI for the helper methods that receive paths as parameters, instead of full URLs\r
+     * @param uri\r
+     */\r
+    public void setBaseUri(Uri uri) {\r
+        mUri = uri;\r
+    }\r
+\r
+    public Uri getBaseUri() {\r
+        return mUri;\r
+    }\r
+    \r
+\r
+    @Override\r
+    public int executeMethod(HostConfiguration hostconfig, final HttpMethod method, final HttpState state) throws IOException, HttpException  {\r
+        if (mCredentials instanceof BearerCredentials) {\r
+            method.getHostAuthState().setAuthScheme(AuthPolicy.getAuthScheme(BearerAuthScheme.AUTH_POLICY));\r
+            method.getHostAuthState().setAuthAttempted(true);\r
+        }\r
+        return super.executeMethod(hostconfig, method, state);\r
+    }\r
+\r
+    \r
+    public final Credentials getCredentials() {\r
+        return mCredentials;\r
+    }\r
+\r

 }\r
 }\r