X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c550c8701bcb477e2d2a6af7c68e5154e5612102..10f99ceb9ca7a65b2d59f30a7ddfbfa7ffc60a7a:/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 1582f8f0..7277b3a7 100644 --- a/src/com/owncloud/android/operations/CreateShareOperation.java +++ b/src/com/owncloud/android/operations/CreateShareOperation.java @@ -24,15 +24,21 @@ package com.owncloud.android.operations; * */ +import android.content.Intent; + import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.ShareType; -import com.owncloud.android.lib.operations.remote.CreateShareRemoteOperation; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.shares.ShareType; +import com.owncloud.android.lib.resources.shares.CreateRemoteShareOperation; +import com.owncloud.android.lib.resources.files.FileUtils; +import com.owncloud.android.operations.common.SyncOperation; +import com.owncloud.android.utils.Log_OC; + +public class CreateShareOperation extends SyncOperation { -public class CreateShareOperation extends RemoteOperation { - private static final String TAG = CreateShareOperation.class.getSimpleName(); protected FileDataStorageManager mStorageManager; @@ -43,7 +49,8 @@ public class CreateShareOperation extends RemoteOperation { private boolean mPublicUpload; private String mPassword; private int mPermissions; - + private Intent mSendIntent; + /** * Constructor * @param path Full path of the file/folder being shared. Mandatory argument @@ -63,7 +70,7 @@ public class CreateShareOperation extends RemoteOperation { * For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27. */ public CreateShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, - String password, int permissions) { + String password, int permissions, Intent sendIntent) { mPath = path; mShareType = shareType; @@ -71,20 +78,50 @@ public class CreateShareOperation extends RemoteOperation { mPublicUpload = publicUpload; mPassword = password; mPermissions = permissions; + mSendIntent = sendIntent; } @Override protected RemoteOperationResult run(OwnCloudClient client) { - CreateShareRemoteOperation operation = new CreateShareRemoteOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions); + CreateRemoteShareOperation operation = new CreateRemoteShareOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions); RemoteOperationResult result = operation.execute(client); if (result.isSuccess()) { - // TODO - // Update DB with the response + if (result.getData().size() > 0) { + OCShare share = (OCShare) result.getData().get(0); + + // Update DB with the response + share.setPath(mPath); + if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) { + share.setIsFolder(true); + } else { + share.setIsFolder(false); + } + share.setPermissions(mPermissions); + + getStorageManager().saveShare(share); + + // Update OCFile with data from share: ShareByLink and publicLink + OCFile file = getStorageManager().getFileByPath(mPath); + if (file!=null) { + mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink()); + file.setPublicLink(share.getShareLink()); + file.setShareByLink(true); + getStorageManager().saveFile(file); + Log_OC.d(TAG, "Public Link = " + file.getPublicLink()); + + } + } } + return result; } + + + public Intent getSendIntent() { + return mSendIntent; + } }