mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Changes from comments in PR#442, in oc-project"

Browse source 
This reverts commit 0aa9a0bc6c.
This commit is contained in:
masensio 2014-03-20 14:01:35 +01:00
parent 0aa9a0bc6c
commit d9219441b1
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
owncloud-android-library

@ -1 +1 @@
Subproject commit 3bf858e2a7ea154e4a00e98fe95d98153b416bbf
Subproject commit ff4dd08dd5ac79ef2ce200d033182773f9dc36b1

23
src/com/owncloud/android/operations/CreateShareOperation.java
View file

@ -42,6 +42,9 @@ import com.owncloud.android.utils.Log_OC;
public class CreateShareOperation extends SyncOperation {
private static final String TAG = CreateShareOperation.class.getSimpleName();
// String to build the link with the token of a share: server address + "/public.php?service=files&t=" + token
private final String SHARING_LINK_TOKEN = "/public.php?service=files&t=";
protected FileDataStorageManager mStorageManager;
@ -92,13 +95,21 @@ public class CreateShareOperation extends SyncOperation {
RemoteOperationResult result = ((GetRemoteSharesForFileOperation)operation).execute(client);
if (result.isSuccess()) {
operation = new CreateRemoteShareOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions);
result = ((CreateRemoteShareOperation)operation).execute(client);
if (result.getData().size() > 0) {
OCShare share = (OCShare) result.getData().get(0);
// Update the link, build it with the token: server address + "/public.php?service=files&t=" + token
share.setShareLink(client.getBaseUri() + SHARING_LINK_TOKEN + share.getToken());
Log_OC.d(TAG, "Build Share link= " + share.getShareLink());
updateData(share);
} else {
operation = new CreateRemoteShareOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions);
result = ((CreateRemoteShareOperation)operation).execute(client);
if (result.isSuccess()) {
if (result.getData().size() > 0) {
OCShare share = (OCShare) result.getData().get(0);
updateData(share);
if (result.isSuccess()) {
if (result.getData().size() > 0) {
OCShare share = (OCShare) result.getData().get(0);
updateData(share);
}
}
}
}