flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Fix login loop when disabling OAuth2

Browse Source
This commit is contained in:
davigonz 2017-08-28 08:57:08 +02:00
parent 2289358775
commit 3072507972
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/owncloud/android/lib/common/accounts/AccountUtils.java
View File

@ -138,13 +138,13 @@ public class AccountUtils {
OwnCloudCredentials credentials = null; OwnCloudCredentials credentials = null;
AccountManager am = AccountManager.get(context); AccountManager am = AccountManager.get(context);
boolean isOauth2 = am.getUserData( String supportsOAuth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2);
account, boolean isOauth2 = supportsOAuth2 != null && supportsOAuth2.equals("TRUE");
AccountUtils.Constants.KEY_SUPPORTS_OAUTH2) != null;
boolean isSamlSso = am.getUserData( String supportsSamlSSo = am.getUserData(account,
account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO);
AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
boolean isSamlSso = supportsSamlSSo != null && supportsSamlSSo.equals("TRUE");
String username = AccountUtils.getUsernameForAccount(account); String username = AccountUtils.getUsernameForAccount(account);
OwnCloudVersion version = new OwnCloudVersion(am.getUserData(account, Constants.KEY_OC_VERSION)); OwnCloudVersion version = new OwnCloudVersion(am.getUserData(account, Constants.KEY_OC_VERSION));