From 3072507972f18dd273260fbeb9b660bdf251ed11 Mon Sep 17 00:00:00 2001 From: davigonz Date: Mon, 28 Aug 2017 08:57:08 +0200 Subject: [PATCH] Fix login loop when disabling OAuth2 --- .../android/lib/common/accounts/AccountUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java index f59cfd59..46b29994 100644 --- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -138,13 +138,13 @@ public class AccountUtils { OwnCloudCredentials credentials = null; AccountManager am = AccountManager.get(context); - boolean isOauth2 = am.getUserData( - account, - AccountUtils.Constants.KEY_SUPPORTS_OAUTH2) != null; + String supportsOAuth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2); + boolean isOauth2 = supportsOAuth2 != null && supportsOAuth2.equals("TRUE"); - boolean isSamlSso = am.getUserData( - account, - AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null; + String supportsSamlSSo = am.getUserData(account, + AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO); + + boolean isSamlSso = supportsSamlSSo != null && supportsSamlSSo.equals("TRUE"); String username = AccountUtils.getUsernameForAccount(account); OwnCloudVersion version = new OwnCloudVersion(am.getUserData(account, Constants.KEY_OC_VERSION));