Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit 2ac5cf0

Browse files
abelgardepJuancaG05
authored andcommitted
Move open in web operations to their proper location
1 parent 173b12e commit 2ac5cf0

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* THE SOFTWARE.
2222
*
2323
*/
24-
package com.owncloud.android.lib.resources.files
24+
package com.owncloud.android.lib.resources.appregistry
2525

2626
import com.owncloud.android.lib.common.OwnCloudClient
2727
import com.owncloud.android.lib.common.http.HttpConstants
@@ -30,7 +30,7 @@ import com.owncloud.android.lib.common.network.WebdavUtils
3030
import com.owncloud.android.lib.common.operations.RemoteOperation
3131
import com.owncloud.android.lib.common.operations.RemoteOperationResult
3232
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
33-
import com.owncloud.android.lib.resources.files.GetUrlToOpenInWebRemoteOperation.OpenInWebParams.Companion.PARAM_FILE_ID
33+
import com.owncloud.android.lib.resources.appregistry.GetUrlToOpenInWebRemoteOperation.OpenInWebParams.Companion.PARAM_FILE_ID
3434
import com.squareup.moshi.JsonAdapter
3535
import com.squareup.moshi.JsonClass
3636
import com.squareup.moshi.Moshi

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/AppRegistryService.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@ import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryRespo
2828

2929
interface AppRegistryService : Service {
3030
fun getAppRegistry(): RemoteOperationResult<AppRegistryResponse>
31+
32+
fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String>
3133
}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/services/OCAppRegistryService.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@ package com.owncloud.android.lib.resources.appregistry.services
2424

2525
import com.owncloud.android.lib.common.OwnCloudClient
2626
import com.owncloud.android.lib.common.operations.RemoteOperationResult
27-
import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryResponse
2827
import com.owncloud.android.lib.resources.appregistry.GetRemoteAppRegistryOperation
28+
import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryResponse
29+
import com.owncloud.android.lib.resources.appregistry.GetUrlToOpenInWebRemoteOperation
2930

3031
class OCAppRegistryService(override val client: OwnCloudClient) : AppRegistryService {
3132
override fun getAppRegistry(): RemoteOperationResult<AppRegistryResponse> =
3233
GetRemoteAppRegistryOperation().execute(client)
34+
35+
override fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String> =
36+
GetUrlToOpenInWebRemoteOperation(openWithWebEndpoint = openWebEndpoint, fileId = fileId).execute(client)
3337
}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import com.owncloud.android.lib.resources.Service
2828
import com.owncloud.android.lib.resources.files.RemoteFile
2929

3030
interface FileService : Service {
31-
fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String>
32-
3331
fun checkPathExistence(
3432
path: String,
3533
isUserLogged: Boolean,

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperatio
2929
import com.owncloud.android.lib.resources.files.CopyRemoteFileOperation
3030
import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation
3131
import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation
32-
import com.owncloud.android.lib.resources.files.GetUrlToOpenInWebRemoteOperation
3332
import com.owncloud.android.lib.resources.files.MoveRemoteFileOperation
3433
import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation
3534
import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation
@@ -39,7 +38,6 @@ import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation
3938
import com.owncloud.android.lib.resources.files.services.FileService
4039

4140
class OCFileService(override val client: OwnCloudClient) : FileService {
42-
4341
override fun checkPathExistence(
4442
path: String,
4543
isUserLogged: Boolean,
@@ -51,9 +49,6 @@ class OCFileService(override val client: OwnCloudClient) : FileService {
5149
spaceWebDavUrl = spaceWebDavUrl,
5250
).execute(client)
5351

54-
override fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String> =
55-
GetUrlToOpenInWebRemoteOperation(openWithWebEndpoint = openWebEndpoint, fileId = fileId).execute(client)
56-
5752
override fun copyFile(
5853
sourceRemotePath: String,
5954
targetRemotePath: String,

0 commit comments

Comments
 (0)