diff --git a/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java b/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java index ba5dd2c0..acd30590 100644 --- a/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java +++ b/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java @@ -97,7 +97,8 @@ public class RemoteOperationResult implements Serializable { ACCOUNT_EXCEPTION, ACCOUNT_NOT_NEW, ACCOUNT_NOT_THE_SAME, - INVALID_CHARACTER_IN_NAME + INVALID_CHARACTER_IN_NAME, + SHARE_NOT_FOUND } private boolean mSuccess = false; diff --git a/src/com/owncloud/android/lib/operations/remote/CreateShareRemoteOperation.java b/src/com/owncloud/android/lib/operations/remote/CreateShareRemoteOperation.java index 3e985da2..744ffabd 100644 --- a/src/com/owncloud/android/lib/operations/remote/CreateShareRemoteOperation.java +++ b/src/com/owncloud/android/lib/operations/remote/CreateShareRemoteOperation.java @@ -139,7 +139,7 @@ public class CreateShareRemoteOperation extends RemoteOperation { } result.setData(sharesObjects); } - } else if (xmlParser.isFilNotFound()){ + } else if (xmlParser.isFileNotFound()){ result = new RemoteOperationResult(ResultCode.FILE_NOT_FOUND); } diff --git a/src/com/owncloud/android/lib/operations/remote/UnshareLinkRemoteOperation.java b/src/com/owncloud/android/lib/operations/remote/UnshareLinkRemoteOperation.java deleted file mode 100644 index 58ce6993..00000000 --- a/src/com/owncloud/android/lib/operations/remote/UnshareLinkRemoteOperation.java +++ /dev/null @@ -1,113 +0,0 @@ -/* ownCloud Android Library is available under MIT license - * Copyright (C) 2014 ownCloud (http://www.owncloud.org/) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - */ - -package com.owncloud.android.lib.operations.remote; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; - -import org.apache.commons.httpclient.HttpStatus; -import org.apache.jackrabbit.webdav.client.methods.DeleteMethod; - -import android.util.Log; - -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.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.utils.ShareUtils; -import com.owncloud.android.lib.utils.ShareXMLParser; - -/** - * Remove a share - * - * @author masensio - * - */ - -public class UnshareLinkRemoteOperation extends RemoteOperation { - - private static final String TAG = UnshareLinkRemoteOperation.class.getSimpleName(); - - private int mIdShare; - - /** - * Constructor - * - * @param idShare Share ID - */ - - public UnshareLinkRemoteOperation(int idShare) { - mIdShare = idShare; - - } - - @Override - protected RemoteOperationResult run(OwnCloudClient client) { - RemoteOperationResult result = null; - int status = -1; - - DeleteMethod delete = null; - - try { - String id = "/" + String.valueOf(mIdShare); - delete = new DeleteMethod(client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE + id); - Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE + id); - - status = client.executeMethod(delete); - - if(isSuccess(status)) { - String response = delete.getResponseBodyAsString(); - Log.d(TAG, "Successful response: " + response); - - result = new RemoteOperationResult(ResultCode.OK); - - // Parse xml response - // convert String into InputStream - InputStream is = new ByteArrayInputStream(response.getBytes()); - ShareXMLParser xmlParser = new ShareXMLParser(); - xmlParser.parseXMLResponse(is); - if (xmlParser.isSuccess()) { - result = new RemoteOperationResult(ResultCode.OK); - } else if (xmlParser.isFilNotFound()){ - result = new RemoteOperationResult(ResultCode.FILE_NOT_FOUND); - } - Log.i(TAG, "Unshare " + id + ": " + result.getLogMessage()); - } - } catch (Exception e) { - result = new RemoteOperationResult(e); - Log.e(TAG, "Unshare Link Exception " + result.getLogMessage(), e); - - } finally { - if (delete != null) - delete.releaseConnection(); - } - return result; - } - - - private boolean isSuccess(int status) { - return (status == HttpStatus.SC_OK); - } -} \ No newline at end of file diff --git a/src/com/owncloud/android/lib/utils/ShareXMLParser.java b/src/com/owncloud/android/lib/utils/ShareXMLParser.java index 9ada0017..828714c5 100644 --- a/src/com/owncloud/android/lib/utils/ShareXMLParser.java +++ b/src/com/owncloud/android/lib/utils/ShareXMLParser.java @@ -115,7 +115,7 @@ public class ShareXMLParser { public boolean isFailure() { return mStatusCode == FAILURE; } - public boolean isFilNotFound() { + public boolean isFileNotFound() { return mStatusCode == FILE_NOT_FOUND; }