Merge pull request #1032 from nextcloud/nc12auth

HOTFIX: Ignore oauth for now and use always basic auth
nextcloud · May 22, 2017 · 58b0592 · 58b0592
2 parents 9bc5d1b + d17af1d
commit 58b0592
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java b/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java
@@ -98,11 +98,8 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         // analyze response  
         if (result.getHttpCode() == HttpStatus.SC_UNAUTHORIZED) {
             String authRequest = ((result.getAuthenticateHeader()).trim()).toLowerCase();
-            if (authRequest.startsWith("basic")) {
+            if (authRequest.startsWith("basic") || authRequest.startsWith("bearer")) {
                 authMethod = AuthenticationMethod.BASIC_HTTP_AUTH;
-
-            } else if (authRequest.startsWith("bearer")) {
-                authMethod = AuthenticationMethod.BEARER_TOKEN;
             }
             // else - fall back to UNKNOWN