From 9724afda5d64a1e454c79e375abcd2ea3c5331f8 Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 21 Aug 2013 18:12:28 +0200 Subject: [PATCH] OC-1028: add extra condition to check of redirection. New method isIdPRedirection at RemoteOperationResult --- src/com/owncloud/android/authentication/AuthenticatorActivity.java | 2 +- src/com/owncloud/android/operations/RemoteOperationResult.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index d844011e..138c8609 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -744,7 +744,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList // 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()) { + if (result.isTemporalRedirection() || result.isIdPRedirection()) { String url = result.getRedirectedLocation(); String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType); diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java index cc2ee67f..57014768 100644 --- a/src/com/owncloud/android/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/operations/RemoteOperationResult.java @@ -24,7 +24,6 @@ import java.net.MalformedURLException; import java.net.SocketException; import java.net.SocketTimeoutException; import java.net.UnknownHostException; -import java.util.Map; import javax.net.ssl.SSLException; @@ -319,5 +318,10 @@ public class RemoteOperationResult implements Serializable { public String getRedirectedLocation() { return mRedirectedLocation; } + + public boolean isIdPRedirection() { + return (mRedirectedLocation.toUpperCase().contains("SAML") || + mRedirectedLocation.toLowerCase().contains("wayf")); + } } -- 2.11.0