X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c68012235a0f16b12eba3ffb01bd373e57b4b59f..901b6ac61e4a84d281e86b4989aa099801b28de7:/src/com/owncloud/android/operations/UnshareLinkOperation.java?ds=sidebyside diff --git a/src/com/owncloud/android/operations/UnshareLinkOperation.java b/src/com/owncloud/android/operations/UnshareLinkOperation.java index 6e273c87..77ca8227 100644 --- a/src/com/owncloud/android/operations/UnshareLinkOperation.java +++ b/src/com/owncloud/android/operations/UnshareLinkOperation.java @@ -20,12 +20,15 @@ package com.owncloud.android.operations; import android.content.Context; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation; -import com.owncloud.android.lib.operations.remote.RemoveRemoteShareOperation; + +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation; +import com.owncloud.android.lib.resources.shares.ShareType; + import com.owncloud.android.operations.common.SyncOperation; import com.owncloud.android.utils.Log_OC; @@ -39,12 +42,12 @@ public class UnshareLinkOperation extends SyncOperation { private static final String TAG = UnshareLinkOperation.class.getSimpleName(); - private OCFile mFile; + private String mRemotePath; private Context mContext; - public UnshareLinkOperation(OCFile file, Context context) { - mFile = file; + public UnshareLinkOperation(String remotePath, Context context) { + mRemotePath = remotePath; mContext = context; } @@ -53,11 +56,7 @@ public class UnshareLinkOperation extends SyncOperation { RemoteOperationResult result = null; // Get Share for a file - String path = mFile.getRemotePath(); - if (mFile.isFolder()) { - path = path.substring(0, path.length()-1); // Remove last / - } - OCShare share = getStorageManager().getShareByPath(path); + OCShare share = getStorageManager().getFirstShareByPathAndType(mRemotePath, ShareType.PUBLIC_LINK); if (share != null) { RemoveRemoteShareOperation operation = new RemoveRemoteShareOperation((int) share.getIdRemoteShared()); @@ -66,16 +65,17 @@ public class UnshareLinkOperation extends SyncOperation { if (result.isSuccess() || result.getCode() == ResultCode.SHARE_NOT_FOUND) { Log_OC.d(TAG, "Share id = " + share.getIdRemoteShared() + " deleted"); - mFile.setShareByLink(false); - mFile.setPublicLink(""); - getStorageManager().saveFile(mFile); + OCFile file = getStorageManager().getFileByPath(mRemotePath); + file.setShareByLink(false); + file.setPublicLink(""); + getStorageManager().saveFile(file); getStorageManager().removeShare(share); if (result.getCode() == ResultCode.SHARE_NOT_FOUND) { - if (existsFile(client, mFile.getRemotePath())) { + if (existsFile(client, file.getRemotePath())) { result = new RemoteOperationResult(ResultCode.OK); } else { - getStorageManager().removeFile(mFile, true, true); + getStorageManager().removeFile(file, true, true); } } }