From 7baf3e43a5954fa155a61192472ab2c61efa7a18 Mon Sep 17 00:00:00 2001 From: Fernando Sanz Date: Tue, 31 Aug 2021 12:37:36 +0200 Subject: [PATCH] The ShareXMLParser has been removed from RemoveRemoteShareOperation.kt class. --- .../shares/RemoveRemoteShareOperation.kt | 156 +++++++++++------- 1 file changed, 98 insertions(+), 58 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt index a9ff69c6..ec5eedda 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt @@ -1,46 +1,48 @@ -/* ownCloud Android Library is available under MIT license - * @author masensio - * @author David A. Velasco - * @author David González Verdugo - * Copyright (C) 2020 ownCloud GmbH. +/* + * ownCloud Android client application + * + * @author masensio + * @author David A. Velasco + * @author David González Verdugo + * @author Fernando Sanz Velasco + * Copyright (C) 2021 ownCloud GmbH. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * - * 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.resources.shares +import android.net.Uri import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.http.HttpConstants import com.owncloud.android.lib.common.http.methods.nonwebdav.DeleteMethod import com.owncloud.android.lib.common.operations.RemoteOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult +import com.owncloud.android.lib.resources.CommonOcsResponse +import com.owncloud.android.lib.resources.shares.responses.ShareItem +import com.squareup.moshi.JsonAdapter +import com.squareup.moshi.Moshi +import com.squareup.moshi.Types import timber.log.Timber +import java.lang.reflect.Type import java.net.URL /** * Remove a share - * - * @author masensio - * @author David A. Velasco - * @author David González Verdugo */ /** @@ -50,44 +52,82 @@ import java.net.URL */ class RemoveRemoteShareOperation(private val remoteShareId: String) : RemoteOperation() { - override fun run(client: OwnCloudClient): RemoteOperationResult { - var result: RemoteOperationResult + private fun buildRequestUri(baseUri: Uri) = + baseUri.buildUpon() + .appendEncodedPath(OCS_ROUTE) + .appendEncodedPath(remoteShareId) + .appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT) + .build() - try { - val requestUri = client.baseUri - val uriBuilder = requestUri.buildUpon() - uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH) - uriBuilder.appendEncodedPath(remoteShareId) - - val deleteMethod = DeleteMethod( - URL(uriBuilder.build().toString()) - ) - - deleteMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) - - val status = client.executeHttpMethod(deleteMethod) - - if (isSuccess(status)) { - - // Parse xml response and obtain the list of shares - val parser = ShareToRemoteOperationResultParser( - ShareXMLParser() - ) - result = parser.parse(deleteMethod.getResponseBodyAsString()) - - Timber.d("Unshare $remoteShareId: ${result.logMessage}") - - } else { - result = RemoteOperationResult(deleteMethod) - } - - } catch (e: Exception) { - result = RemoteOperationResult(e) - Timber.e(e, "Unshare Link Exception ${result.logMessage}") + private fun parseResponse(response: String): ShareResponse? { + val moshi = Moshi.Builder().build() + val listOfShareItemType: Type = Types.newParameterizedType(List::class.java, ShareItem::class.java) + val commonOcsType: Type = Types.newParameterizedType(CommonOcsResponse::class.java, listOfShareItemType) + val adapter: JsonAdapter>> = moshi.adapter(commonOcsType) + return adapter.fromJson(response)?.ocs?.data?.let { listOfShareItems -> + ShareResponse(listOfShareItems.map { shareItem -> + shareItem.toRemoteShare() + }) } + } + private fun onResultUnsuccessful( + method: DeleteMethod, + response: String?, + status: Int + ): RemoteOperationResult { + Timber.e("Failed response while unshare link ") + if (response != null) { + Timber.e("*** status code: $status; response message: $response") + } else { + Timber.e("*** status code: $status") + } + return RemoteOperationResult(method) + } + + private fun onRequestSuccessful(response: String?): RemoteOperationResult { + val result = RemoteOperationResult(RemoteOperationResult.ResultCode.OK) + Timber.d("Successful response: $response") + result.data = parseResponse(response!!) + Timber.d("*** Unshare link completed ") return result } + override fun run(client: OwnCloudClient): RemoteOperationResult { + + val requestUri = buildRequestUri(client.baseUri) + + val deleteMethod = DeleteMethod(URL(requestUri.toString())).apply { + addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) + } + + return try { + val status = client.executeHttpMethod(deleteMethod) + val response = deleteMethod.getResponseBodyAsString() + + if (!isSuccess(status)) { + onResultUnsuccessful(deleteMethod, response, status) + } else { + onRequestSuccessful(response) + } + } catch (e: Exception) { + Timber.e(e, "Exception while unshare link") + RemoteOperationResult(e) + } + } + private fun isSuccess(status: Int): Boolean = status == HttpConstants.HTTP_OK + + companion object { + + //OCS Route + private const val OCS_ROUTE = "ocs/v2.php/apps/files_sharing/api/v1/shares" + + //Arguments - names + private const val PARAM_FORMAT = "format" + + //Arguments - constant values + private const val VALUE_FORMAT = "json" + + } }