projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show share with users option if the server supports search users function
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
authentication
/
AuthenticatorAsyncTask.java
diff --git
a/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
b/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
index
be15d1c
..
a25ade8
100644
(file)
--- a/
src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
+++ b/
src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
@@
-27,6
+27,7
@@
import android.os.AsyncTask;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.OwnCloudClientFactory;
import com.owncloud.android.lib.common.OwnCloudCredentials;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.OwnCloudClientFactory;
import com.owncloud.android.lib.common.OwnCloudCredentials;
+import com.owncloud.android.lib.common.network.RedirectionPath;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
@@
-61,7
+62,6
@@
public class AuthenticatorAsyncTask extends AsyncTask<Object, Void, RemoteOpera
// Client
Uri uri = Uri.parse(url);
OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(uri, mContext, true);
// Client
Uri uri = Uri.parse(url);
OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(uri, mContext, true);
-
client.setCredentials(credentials);
// Operation
client.setCredentials(credentials);
// Operation
@@
-72,6
+72,12
@@
public class AuthenticatorAsyncTask extends AsyncTask<Object, Void, RemoteOpera
);
result = operation.execute(client);
);
result = operation.execute(client);
+ if (operation.wasRedirected()) {
+ RedirectionPath redirectionPath = operation.getRedirectionPath();
+ String permanentLocation = redirectionPath.getLastPermanentLocation();
+ result.setLastPermanentLocation(permanentLocation);
+ }
+
} else {
result = new RemoteOperationResult(RemoteOperationResult.ResultCode.UNKNOWN_ERROR);
}
} else {
result = new RemoteOperationResult(RemoteOperationResult.ResultCode.UNKNOWN_ERROR);
}