From 2ac5cf0657a833757e01c1049c8bee88ad6f4191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Fri, 24 Mar 2023 14:56:14 +0100 Subject: [PATCH] Move open in web operations to their proper location --- .../GetUrlToOpenInWebRemoteOperation.kt | 4 ++-- .../resources/appregistry/services/AppRegistryService.kt | 2 ++ .../resources/appregistry/services/OCAppRegistryService.kt | 6 +++++- .../android/lib/resources/files/services/FileService.kt | 2 -- .../files/services/implementation/OCFileService.kt | 5 ----- 5 files changed, 9 insertions(+), 10 deletions(-) rename owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/{files => appregistry}/GetUrlToOpenInWebRemoteOperation.kt (95%) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetUrlToOpenInWebRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/GetUrlToOpenInWebRemoteOperation.kt similarity index 95% rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetUrlToOpenInWebRemoteOperation.kt rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/GetUrlToOpenInWebRemoteOperation.kt index b36cb760..9a9c1c5c 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetUrlToOpenInWebRemoteOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/GetUrlToOpenInWebRemoteOperation.kt @@ -21,7 +21,7 @@ * THE SOFTWARE. * */ -package com.owncloud.android.lib.resources.files +package com.owncloud.android.lib.resources.appregistry import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.http.HttpConstants @@ -30,7 +30,7 @@ import com.owncloud.android.lib.common.network.WebdavUtils import com.owncloud.android.lib.common.operations.RemoteOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode -import com.owncloud.android.lib.resources.files.GetUrlToOpenInWebRemoteOperation.OpenInWebParams.Companion.PARAM_FILE_ID +import com.owncloud.android.lib.resources.appregistry.GetUrlToOpenInWebRemoteOperation.OpenInWebParams.Companion.PARAM_FILE_ID import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonClass import com.squareup.moshi.Moshi diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/AppRegistryService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/AppRegistryService.kt index 3950faab..23cd9e70 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/AppRegistryService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/AppRegistryService.kt @@ -28,4 +28,6 @@ import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryRespo interface AppRegistryService : Service { fun getAppRegistry(): RemoteOperationResult + + fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/OCAppRegistryService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/OCAppRegistryService.kt index e0d93a33..22209219 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/OCAppRegistryService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/OCAppRegistryService.kt @@ -24,10 +24,14 @@ package com.owncloud.android.lib.resources.appregistry.services import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.operations.RemoteOperationResult -import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryResponse import com.owncloud.android.lib.resources.appregistry.GetRemoteAppRegistryOperation +import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryResponse +import com.owncloud.android.lib.resources.appregistry.GetUrlToOpenInWebRemoteOperation class OCAppRegistryService(override val client: OwnCloudClient) : AppRegistryService { override fun getAppRegistry(): RemoteOperationResult = GetRemoteAppRegistryOperation().execute(client) + + override fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult = + GetUrlToOpenInWebRemoteOperation(openWithWebEndpoint = openWebEndpoint, fileId = fileId).execute(client) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt index 1421648b..b524dc3f 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt @@ -28,8 +28,6 @@ import com.owncloud.android.lib.resources.Service import com.owncloud.android.lib.resources.files.RemoteFile interface FileService : Service { - fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult - fun checkPathExistence( path: String, isUserLogged: Boolean, diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt index 8ec44d46..7b86a4fa 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt @@ -29,7 +29,6 @@ import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperatio import com.owncloud.android.lib.resources.files.CopyRemoteFileOperation import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation -import com.owncloud.android.lib.resources.files.GetUrlToOpenInWebRemoteOperation import com.owncloud.android.lib.resources.files.MoveRemoteFileOperation import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation @@ -39,7 +38,6 @@ import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation import com.owncloud.android.lib.resources.files.services.FileService class OCFileService(override val client: OwnCloudClient) : FileService { - override fun checkPathExistence( path: String, isUserLogged: Boolean, @@ -51,9 +49,6 @@ class OCFileService(override val client: OwnCloudClient) : FileService { spaceWebDavUrl = spaceWebDavUrl, ).execute(client) - override fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult = - GetUrlToOpenInWebRemoteOperation(openWithWebEndpoint = openWebEndpoint, fileId = fileId).execute(client) - override fun copyFile( sourceRemotePath: String, targetRemotePath: String,