X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1fb1a3294efd93ae80d49bb3cb3c9516365be2b7..d24ba158d24c161a0db484ea551a40851a9d60e8:/src/com/owncloud/android/operations/CreateShareOperation.java diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java index 17151abf..896ecca7 100644 --- a/src/com/owncloud/android/operations/CreateShareOperation.java +++ b/src/com/owncloud/android/operations/CreateShareOperation.java @@ -43,8 +43,6 @@ 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; @@ -94,25 +92,18 @@ public class CreateShareOperation extends SyncOperation { operation = new GetRemoteSharesForFileOperation(mPath, false, false); RemoteOperationResult result = ((GetRemoteSharesForFileOperation)operation).execute(client); + if (!result.isSuccess() || result.getData().size() <= 0) { + 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); - // 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); - } - } - } + } } + return result; }