flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Rename services

Browse Source
This commit is contained in:
agarcia 2020-02-18 16:32:10 +01:00 committed by davigonz
parent 7e6b63db1f
commit d2ee1294f2
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/CheckPathExistenceRemoteOperation.kt → owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt
View File

@ -21,7 +21,7 @@
* THE SOFTWARE. * THE SOFTWARE.
* *
*/ */
package com.owncloud.android.lib.resources.server package com.owncloud.android.lib.resources.files
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

4
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/ServerService.kt → owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileService.kt
View File

@ -21,11 +21,11 @@
* THE SOFTWARE. * THE SOFTWARE.
* *
*/ */
package com.owncloud.android.lib.resources.server package com.owncloud.android.lib.resources.files
import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.Service import com.owncloud.android.lib.resources.Service
interface ServerService: Service { interface FileService: Service {
fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean> fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean>
} }

1
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
View File

@ -31,7 +31,6 @@ 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.server.CheckPathExistenceRemoteOperation;
import timber.log.Timber; import timber.log.Timber;
import java.io.File; import java.io.File;

11
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetRemoteStatusOperation.kt → owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt
View File

@ -21,7 +21,7 @@
* THE SOFTWARE. * THE SOFTWARE.
* *
*/ */
package com.owncloud.android.lib.resources.server package com.owncloud.android.lib.resources.status
import android.net.Uri import android.net.Uri
import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.OwnCloudClient
@ -30,7 +30,6 @@ import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
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.status.OwnCloudVersion
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import timber.log.Timber import timber.log.Timber
@ -52,7 +51,9 @@ class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
override fun run(client: OwnCloudClient): RemoteOperationResult<OwnCloudVersion> { override fun run(client: OwnCloudClient): RemoteOperationResult<OwnCloudVersion> {
val baseUriStr = client.baseUri.toString() val baseUriStr = client.baseUri.toString()
if (baseUriStr.startsWith(HTTP_PREFIX) || baseUriStr.startsWith(HTTPS_PREFIX)) { if (baseUriStr.startsWith(HTTP_PREFIX) || baseUriStr.startsWith(
HTTPS_PREFIX
)) {
tryConnection(client) tryConnection(client)
} else { } else {
client.baseUri = Uri.parse(HTTPS_PREFIX + baseUriStr) client.baseUri = Uri.parse(HTTPS_PREFIX + baseUriStr)
@ -92,7 +93,9 @@ class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
while (!redirectedLocation.isNullOrEmpty() && !latestResult.isSuccess) { while (!redirectedLocation.isNullOrEmpty() && !latestResult.isSuccess) {
isRedirectToNonSecureConnection = isRedirectToNonSecureConnection =
isRedirectToNonSecureConnection || isRedirectToNonSecureConnection ||
(baseUrlSt.startsWith(HTTPS_PREFIX) && redirectedLocation.startsWith(HTTP_PREFIX)) (baseUrlSt.startsWith(HTTPS_PREFIX) && redirectedLocation.startsWith(
HTTP_PREFIX
))
getMethod = GetMethod(URL(redirectedLocation)).apply { getMethod = GetMethod(URL(redirectedLocation)).apply {
setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS) setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS)

4
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/AnonymousService.kt → owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/ServerInfoService.kt
View File

@ -21,12 +21,12 @@
* THE SOFTWARE. * THE SOFTWARE.
* *
*/ */
package com.owncloud.android.lib.resources.server package com.owncloud.android.lib.resources.status
import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.status.OwnCloudVersion import com.owncloud.android.lib.resources.status.OwnCloudVersion
interface AnonymousService { interface ServerInfoService {
fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean> fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean>
fun getRemoteStatus(path: String): RemoteOperationResult<OwnCloudVersion> fun getRemoteStatus(path: String): RemoteOperationResult<OwnCloudVersion>