mirror of
https://github.com/owncloud/android-library.git
synced 2025-06-07 07:56:19 +00:00
Move open in web operations to their proper location
This commit is contained in:
parent
173b12eeca
commit
2ac5cf0657
@ -21,7 +21,7 @@
|
|||||||
* THE SOFTWARE.
|
* 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.OwnCloudClient
|
||||||
import com.owncloud.android.lib.common.http.HttpConstants
|
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.RemoteOperation
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
|
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.JsonAdapter
|
||||||
import com.squareup.moshi.JsonClass
|
import com.squareup.moshi.JsonClass
|
||||||
import com.squareup.moshi.Moshi
|
import com.squareup.moshi.Moshi
|
@ -28,4 +28,6 @@ import com.owncloud.android.lib.resources.appregistry.responses.AppRegistryRespo
|
|||||||
|
|
||||||
interface AppRegistryService : Service {
|
interface AppRegistryService : Service {
|
||||||
fun getAppRegistry(): RemoteOperationResult<AppRegistryResponse>
|
fun getAppRegistry(): RemoteOperationResult<AppRegistryResponse>
|
||||||
|
|
||||||
|
fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String>
|
||||||
}
|
}
|
||||||
|
@ -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.OwnCloudClient
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
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.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 {
|
class OCAppRegistryService(override val client: OwnCloudClient) : AppRegistryService {
|
||||||
override fun getAppRegistry(): RemoteOperationResult<AppRegistryResponse> =
|
override fun getAppRegistry(): RemoteOperationResult<AppRegistryResponse> =
|
||||||
GetRemoteAppRegistryOperation().execute(client)
|
GetRemoteAppRegistryOperation().execute(client)
|
||||||
|
|
||||||
|
override fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String> =
|
||||||
|
GetUrlToOpenInWebRemoteOperation(openWithWebEndpoint = openWebEndpoint, fileId = fileId).execute(client)
|
||||||
}
|
}
|
||||||
|
@ -28,8 +28,6 @@ import com.owncloud.android.lib.resources.Service
|
|||||||
import com.owncloud.android.lib.resources.files.RemoteFile
|
import com.owncloud.android.lib.resources.files.RemoteFile
|
||||||
|
|
||||||
interface FileService : Service {
|
interface FileService : Service {
|
||||||
fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String>
|
|
||||||
|
|
||||||
fun checkPathExistence(
|
fun checkPathExistence(
|
||||||
path: String,
|
path: String,
|
||||||
isUserLogged: Boolean,
|
isUserLogged: Boolean,
|
||||||
|
@ -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.CopyRemoteFileOperation
|
||||||
import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation
|
import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation
|
||||||
import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation
|
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.MoveRemoteFileOperation
|
||||||
import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation
|
import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation
|
||||||
import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation
|
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
|
import com.owncloud.android.lib.resources.files.services.FileService
|
||||||
|
|
||||||
class OCFileService(override val client: OwnCloudClient) : FileService {
|
class OCFileService(override val client: OwnCloudClient) : FileService {
|
||||||
|
|
||||||
override fun checkPathExistence(
|
override fun checkPathExistence(
|
||||||
path: String,
|
path: String,
|
||||||
isUserLogged: Boolean,
|
isUserLogged: Boolean,
|
||||||
@ -51,9 +49,6 @@ class OCFileService(override val client: OwnCloudClient) : FileService {
|
|||||||
spaceWebDavUrl = spaceWebDavUrl,
|
spaceWebDavUrl = spaceWebDavUrl,
|
||||||
).execute(client)
|
).execute(client)
|
||||||
|
|
||||||
override fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String> =
|
|
||||||
GetUrlToOpenInWebRemoteOperation(openWithWebEndpoint = openWebEndpoint, fileId = fileId).execute(client)
|
|
||||||
|
|
||||||
override fun copyFile(
|
override fun copyFile(
|
||||||
sourceRemotePath: String,
|
sourceRemotePath: String,
|
||||||
targetRemotePath: String,
|
targetRemotePath: String,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user