From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 24 Jan 2013 09:30:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/oauth_login' into oauth_login
X-Git-Tag: oc-android-1.4.3~29^2~18
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ac07e35d8ab68bf94d5cd8b45680ea69247fcc9f?hp=088b1e83a46c97bc2d9f37654892a2d8a29bc029

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

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 312b8287..a9d2e676 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -330,8 +330,9 @@ public class WebdavClient extends HttpClient {
 
     @Override
     public int executeMethod(HostConfiguration hostconfig, final HttpMethod method, final HttpState state) throws IOException, HttpException  {
-        if (mCredentials instanceof BearerAuthScheme) {
+        if (mCredentials instanceof BearerCredentials) {
             method.getHostAuthState().setAuthScheme(AuthPolicy.getAuthScheme(BearerAuthScheme.AUTH_POLICY));
+            method.getHostAuthState().setAuthAttempted(true);
         }
         return super.executeMethod(hostconfig, method, state);
     }