mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-03 14:30:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Browse source 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
This commit is contained in:
masensio 2013-08-27 12:15:06 +02:00
commit da77406209
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -788,8 +788,9 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
} catch (IllegalArgumentException e) {
// NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens
}
if (result.isTemporalRedirection() && result.isIdPRedirection()) {
//if (result.isTemporalRedirection() && result.isIdPRedirection()) {
if (result.isIdPRedirection()) {
String url = result.getRedirectedLocation();
String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);