瀏覽代碼

remove version dependency as NC can this in all supported version

tobiasKaminsky 7 年之前
父節點
當前提交
ebf0a40195
共有 1 個文件被更改,包括 2 次插入13 次删除
  1. 2 13
      src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

+ 2 - 13
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -776,13 +776,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
 
             OwnCloudCredentials credentials = null;
             OwnCloudCredentials credentials = null;
             if (BASIC_TOKEN_TYPE.equals(mAuthTokenType)) {
             if (BASIC_TOKEN_TYPE.equals(mAuthTokenType)) {
-                String version = savedInstanceState.getString(KEY_OC_VERSION);
-                OwnCloudVersion ocVersion = (version != null) ? new OwnCloudVersion(version) : null;
-                credentials = OwnCloudCredentialsFactory.newBasicCredentials(
-                        username,
-                        password,
-                        (ocVersion != null && ocVersion.isPreemptiveAuthenticationPreferred())
-                );
+                credentials = OwnCloudCredentialsFactory.newBasicCredentials(username, password);
 
 
             } else if (OAUTH_TOKEN_TYPE.equals(mAuthTokenType)) {
             } else if (OAUTH_TOKEN_TYPE.equals(mAuthTokenType)) {
                 credentials = OwnCloudCredentialsFactory.newBearerCredentials(mAuthToken);
                 credentials = OwnCloudCredentialsFactory.newBearerCredentials(mAuthToken);
@@ -1129,12 +1123,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         dialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);
         dialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);
 
 
         /// validate credentials accessing the root folder
         /// validate credentials accessing the root folder
-        OwnCloudCredentials credentials = OwnCloudCredentialsFactory.newBasicCredentials(
-                username,
-                password,
-                (mServerInfo != null && mServerInfo.mVersion != null
-                        && mServerInfo.mVersion.isPreemptiveAuthenticationPreferred())
-        );
+        OwnCloudCredentials credentials = OwnCloudCredentialsFactory.newBasicCredentials(username, password);
         accessRootFolder(credentials);
         accessRootFolder(credentials);
     }
     }