mirror of
https://github.com/owncloud/android-library.git
synced 2025-10-31 02:17:41 +00:00
Remove ugly dependency from GetRemoteStatusOperation
Create AnonymousService for operations that not require authentication
This commit is contained in:
abelgardep
davigonz
parent
ad533c8307
commit
ec5c9fc4aa
@ -329,5 +329,7 @@ public class AccountUtils {
|
||||
* OAuth2 scope
|
||||
*/
|
||||
public static final String KEY_OAUTH2_SCOPE = "oc_oauth2_scope";
|
||||
|
||||
public static final String WEBDAV_PATH_4_0_AND_LATER = "/remote.php/dav";
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
/* ownCloud Android Library is available under MIT license
|
||||
* Copyright (C) 2020 ownCloud GmbH.
|
||||
*
|
||||
* 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.server
|
||||
|
||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
||||
import com.owncloud.android.lib.resources.status.OwnCloudVersion
|
||||
|
||||
interface AnonymousService {
|
||||
fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Any>
|
||||
|
||||
fun getRemoteStatus(path: String): RemoteOperationResult<OwnCloudVersion>
|
||||
}
|
||||
@ -56,7 +56,7 @@ class CheckPathExistenceOperation(
|
||||
*
|
||||
* @return Sequence of redirections followed, if any, or NULL if the operation was not executed.
|
||||
*/
|
||||
var redirectionPath: RedirectionPath? = null
|
||||
lateinit var redirectionPath: RedirectionPath
|
||||
private set
|
||||
|
||||
override fun run(client: OwnCloudClient): RemoteOperationResult<Any> {
|
||||
@ -75,7 +75,7 @@ class CheckPathExistenceOperation(
|
||||
var status = client.executeHttpMethod(propFindMethod)
|
||||
if (previousFollowRedirects) {
|
||||
redirectionPath = client.followRedirection(propFindMethod)
|
||||
status = redirectionPath?.lastStatus!!
|
||||
status = redirectionPath.lastStatus
|
||||
}
|
||||
/* PROPFIND method
|
||||
* 404 NOT FOUND: path doesn't exist,
|
||||
@ -103,10 +103,9 @@ class CheckPathExistenceOperation(
|
||||
/**
|
||||
* @return 'True' if the operation was executed and at least one redirection was followed.
|
||||
*/
|
||||
fun wasRedirected() = redirectionPath != null && redirectionPath!!.redirectionsCount > 0
|
||||
fun wasRedirected() = redirectionPath.redirectionsCount > 0
|
||||
|
||||
private fun isSuccess(status: Int) =
|
||||
status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_MULTI_STATUS || status == HttpConstants.HTTP_MULTI_STATUS
|
||||
private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_MULTI_STATUS
|
||||
|
||||
companion object {
|
||||
/**
|
||||
|
||||
@ -23,9 +23,6 @@
|
||||
*/
|
||||
package com.owncloud.android.lib.resources.server
|
||||
|
||||
import android.content.Context
|
||||
import android.net.ConnectivityManager
|
||||
import android.net.NetworkInfo
|
||||
import android.net.Uri
|
||||
import com.owncloud.android.lib.common.OwnCloudClient
|
||||
import com.owncloud.android.lib.common.http.HttpConstants
|
||||
@ -42,21 +39,18 @@ import java.util.concurrent.TimeUnit
|
||||
import javax.net.ssl.SSLException
|
||||
|
||||
/**
|
||||
* Checks if the server is valid and if the server supports the Share API
|
||||
* Checks if the server is valid
|
||||
*
|
||||
* @author David A. Velasco
|
||||
* @author masensio
|
||||
* @author David González Verdugo
|
||||
* @author Abel García de Prada
|
||||
*/
|
||||
class GetRemoteStatusOperation(private var context: Context) : RemoteOperation<OwnCloudVersion>() {
|
||||
class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
|
||||
private lateinit var latestResult: RemoteOperationResult<OwnCloudVersion>
|
||||
|
||||
override fun run(client: OwnCloudClient): RemoteOperationResult<OwnCloudVersion> {
|
||||
|
||||
if (!isOnline) {
|
||||
return RemoteOperationResult(ResultCode.NO_NETWORK_CONNECTION)
|
||||
}
|
||||
|
||||
val baseUriStr = client.baseUri.toString()
|
||||
if (baseUriStr.startsWith(HTTP_PREFIX) || baseUriStr.startsWith(HTTPS_PREFIX)) {
|
||||
tryConnection(client)
|
||||
@ -73,7 +67,7 @@ class GetRemoteStatusOperation(private var context: Context) : RemoteOperation<O
|
||||
}
|
||||
|
||||
private fun tryConnection(client: OwnCloudClient): Boolean {
|
||||
var retval = false
|
||||
var successfulConnection = false
|
||||
val baseUrlSt = client.baseUri.toString()
|
||||
try {
|
||||
var getMethod = GetMethod(URL(baseUrlSt + OwnCloudClient.STATUS_PATH)).apply {
|
||||
@ -90,10 +84,10 @@ class GetRemoteStatusOperation(private var context: Context) : RemoteOperation<O
|
||||
else RemoteOperationResult(getMethod)
|
||||
} catch (sslE: SSLException) {
|
||||
latestResult = RemoteOperationResult(sslE)
|
||||
return false
|
||||
return successfulConnection
|
||||
}
|
||||
var redirectedLocation = latestResult.redirectedLocation
|
||||
while (redirectedLocation != null && redirectedLocation.isNotEmpty() && !latestResult.isSuccess) {
|
||||
while (!redirectedLocation.isNullOrEmpty() && !latestResult.isSuccess) {
|
||||
isRedirectToNonSecureConnection =
|
||||
isRedirectToNonSecureConnection or
|
||||
(baseUrlSt.startsWith(HTTPS_PREFIX) && redirectedLocation.startsWith(HTTP_PREFIX))
|
||||
@ -108,7 +102,6 @@ class GetRemoteStatusOperation(private var context: Context) : RemoteOperation<O
|
||||
}
|
||||
|
||||
if (isSuccess(status)) {
|
||||
Timber.d(getMethod.responseBodyAsString)
|
||||
val respJSON = JSONObject(getMethod.responseBodyAsString)
|
||||
if (!respJSON.getBoolean(NODE_INSTALLED)) {
|
||||
latestResult = RemoteOperationResult(ResultCode.INSTANCE_NOT_CONFIGURED)
|
||||
@ -120,10 +113,11 @@ class GetRemoteStatusOperation(private var context: Context) : RemoteOperation<O
|
||||
latestResult = if (isRedirectToNonSecureConnection) {
|
||||
RemoteOperationResult(ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION)
|
||||
} else {
|
||||
RemoteOperationResult(if (baseUrlSt.startsWith(HTTPS_PREFIX)) ResultCode.OK_SSL else ResultCode.OK_NO_SSL)
|
||||
if (baseUrlSt.startsWith(HTTPS_PREFIX)) RemoteOperationResult(ResultCode.OK_SSL)
|
||||
else RemoteOperationResult(ResultCode.OK_NO_SSL)
|
||||
}
|
||||
latestResult.data = ocVersion
|
||||
retval = true
|
||||
successfulConnection = true
|
||||
}
|
||||
} else {
|
||||
latestResult = RemoteOperationResult(getMethod)
|
||||
@ -134,25 +128,15 @@ class GetRemoteStatusOperation(private var context: Context) : RemoteOperation<O
|
||||
latestResult = RemoteOperationResult(e)
|
||||
}
|
||||
when {
|
||||
latestResult.isSuccess -> {
|
||||
Timber.i("Connection check at $baseUrlSt: ${latestResult.logMessage}")
|
||||
}
|
||||
latestResult.exception != null -> {
|
||||
Timber.e(latestResult.exception, "Connection check at $baseUrlSt: ${latestResult.logMessage}")
|
||||
}
|
||||
else -> {
|
||||
Timber.e("Connection check at $baseUrlSt: ${latestResult.logMessage}")
|
||||
}
|
||||
}
|
||||
return retval
|
||||
}
|
||||
latestResult.isSuccess -> Timber.i("Connection check at $baseUrlSt: ${latestResult.logMessage}")
|
||||
|
||||
private val isOnline: Boolean
|
||||
get() {
|
||||
val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
|
||||
val activeNetwork: NetworkInfo? = cm.activeNetworkInfo
|
||||
return activeNetwork?.isConnected == true
|
||||
latestResult.isException ->
|
||||
Timber.e(latestResult.exception, "Connection check at $baseUrlSt: ${latestResult.logMessage}")
|
||||
|
||||
else -> Timber.e("Connection check at $baseUrlSt: ${latestResult.logMessage}")
|
||||
}
|
||||
return successfulConnection
|
||||
}
|
||||
|
||||
private fun isSuccess(status: Int): Boolean = status == HttpConstants.HTTP_OK
|
||||
|
||||
@ -161,7 +145,7 @@ class GetRemoteStatusOperation(private var context: Context) : RemoteOperation<O
|
||||
* Maximum time to wait for a response from the server when the connection is being tested,
|
||||
* in MILLISECONDs.
|
||||
*/
|
||||
const val TRY_CONNECTION_TIMEOUT: Long = 5000
|
||||
private const val TRY_CONNECTION_TIMEOUT: Long = 5000
|
||||
private const val NODE_INSTALLED = "installed"
|
||||
private const val NODE_VERSION = "version"
|
||||
private const val HTTPS_PREFIX = "https://"
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
package com.owncloud.android.lib.resources.server
|
||||
|
||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
||||
@ -29,5 +28,4 @@ import com.owncloud.android.lib.resources.Service
|
||||
|
||||
interface ServerService: Service {
|
||||
fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Any>
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user