Merge remote-tracking branch 'origin/oauth_login' into oauth_login

[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 312b828..a9d2e67 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -330,8 +330,9 @@ public class WebdavClient extends HttpClient {
 \r
     @Override\r
     public int executeMethod(HostConfiguration hostconfig, final HttpMethod method, final HttpState state) throws IOException, HttpException  {\r
 \r
     @Override\r
     public int executeMethod(HostConfiguration hostconfig, final HttpMethod method, final HttpState state) throws IOException, HttpException  {\r

-        if (mCredentials instanceof BearerAuthScheme) {\r
+        if (mCredentials instanceof BearerCredentials) {\r

             method.getHostAuthState().setAuthScheme(AuthPolicy.getAuthScheme(BearerAuthScheme.AUTH_POLICY));\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
         return super.executeMethod(hostconfig, method, state);\r
     }\r