mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

OC-1028: add extra condition to check of redirection. New method isIdPRedirection at RemoteOperationResult

Browse source
This commit is contained in:
masensio 2013-08-21 18:12:28 +02:00
parent b458c92be0
commit 9724afda5d
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);

6
src/com/owncloud/android/operations/RemoteOperationResult.java
View file

@ -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;
@ -320,4 +319,9 @@ public class RemoteOperationResult implements Serializable {
return mRedirectedLocation;
}
public boolean isIdPRedirection() {
return (mRedirectedLocation.toUpperCase().contains("SAML") ||
mRedirectedLocation.toLowerCase().contains("wayf"));
}
}