浏览代码

early access to login

tobiasKaminsky 7 年之前
父节点
当前提交
76fd2da696
共有 1 个文件被更改,包括 4 次插入5 次删除
  1. 4 5
      src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

+ 4 - 5
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1302,7 +1302,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
             webViewLoginMethod = mServerInfo.mVersion.isWebLoginSupported();
 
-            if (webViewLoginMethod) {
+            if (webViewUser != null && !webViewUser.isEmpty() &&
+                    webViewPassword != null && !webViewPassword.isEmpty()) {
+                checkBasicAuthorization(webViewUser, webViewPassword);
+            } else if (webViewLoginMethod) {
                 // hide old login
                 mOkButton.setVisibility(View.GONE);
                 mUsernameInputLayout.setVisibility(View.GONE);
@@ -1320,10 +1323,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mPasswordInputLayout.setVisibility(View.VISIBLE);
             }
 
-            if (webViewLoginMethod) {
-                checkBasicAuthorization(webViewUser, webViewPassword);
-            }
-
             if (!authSupported(mServerInfo.mAuthMethod)) {
 
                 if (!webViewLoginMethod) {