diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java index fd1fad9a..2aefd06b 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java @@ -135,10 +135,10 @@ public class OwnCloudClient extends HttpClient { method.setRequestHeader(AUTHORIZATION_HEADER, mCredentials.getHeaderAuth()); } - status = method.execute(); + status = method.execute(this); if (shouldConnectionValidatorBeCalled(method, status)) { - retry = mConnectionValidator.validate(this, mSingleSessionManager); // retry on success fail on no success + retry = mConnectionValidator.validate(this, mSingleSessionManager, getContext()); // retry on success fail on no success } else if(method.getFollowPermanentRedirects() && status == HTTP_MOVED_PERMANENTLY) { retry = true; method.setFollowRedirects(true); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.kt index ec826dd8..29f9ea9a 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.kt @@ -37,25 +37,40 @@ import java.net.MalformedURLException import java.net.URL import java.util.concurrent.TimeUnit -abstract class HttpBaseMethod constructor(clientWrapper: HttpClient, url: URL) { - var okHttpClient: OkHttpClient +abstract class HttpBaseMethod constructor(url: URL) { var httpUrl: HttpUrl = url.toHttpUrlOrNull() ?: throw MalformedURLException() var request: Request private var _followPermanentRedirects = false abstract var response: Response - var call: Call? = null + var followRedirects: Boolean? = true + var retryOnConnectionFailure: Boolean? = false + var connectionTimeoutVal: Long? = null + var connectionTimeoutUnit: TimeUnit? = null + var readTimeoutVal: Long? = null + var readTimeoutUnit: TimeUnit? = null + init { - okHttpClient = clientWrapper.okHttpClient request = Request.Builder() .url(httpUrl) .build() } @Throws(Exception::class) - open fun execute(): Int { - return onExecute() + open fun execute(httpClient: HttpClient): Int { + val okHttpClient = httpClient.okHttpClient.newBuilder().apply { + retryOnConnectionFailure?.let { retryOnConnectionFailure(it) } + followRedirects?.let { followRedirects(it) } + readTimeoutUnit?.let { unit -> + readTimeoutVal?.let { readTimeout(it, unit) } + } + connectionTimeoutUnit?.let { unit -> + connectionTimeoutVal?.let { connectTimeout(it, unit) } + } + }.build() + + return onExecute(okHttpClient) } open fun setUrl(url: HttpUrl) { @@ -137,42 +152,26 @@ abstract class HttpBaseMethod constructor(clientWrapper: HttpClient, url: URL) { // Setter ////////////////////////////// // Connection parameters + /* open fun setRetryOnConnectionFailure(retryOnConnectionFailure: Boolean) { - okHttpClient = okHttpClient.newBuilder() - .retryOnConnectionFailure(retryOnConnectionFailure) - .build() + retryOnConnectionFailureVal = true } + */ + open fun setReadTimeout(readTimeout: Long, timeUnit: TimeUnit) { - okHttpClient = okHttpClient.newBuilder() - .readTimeout(readTimeout, timeUnit) - .build() + readTimeoutVal = readTimeout + readTimeoutUnit = timeUnit } open fun setConnectionTimeout( connectionTimeout: Long, timeUnit: TimeUnit ) { - okHttpClient = okHttpClient.newBuilder() - .readTimeout(connectionTimeout, timeUnit) - .build() + connectionTimeoutVal = connectionTimeout + connectionTimeoutUnit = timeUnit } - open fun setFollowRedirects(followRedirects: Boolean) { - okHttpClient = okHttpClient.newBuilder() - .followRedirects(followRedirects) - .build() - } - - open fun getFollowRedirects() = okHttpClient.followRedirects - - open fun setFollowPermanentRedirects(followRedirects: Boolean) { - _followPermanentRedirects = followRedirects - } - - open fun getFollowPermanentRedirects() = _followPermanentRedirects - - /************ *** Call *** ************/ @@ -187,5 +186,5 @@ abstract class HttpBaseMethod constructor(clientWrapper: HttpClient, url: URL) { // For override ////////////////////////////// @Throws(Exception::class) - protected abstract fun onExecute(): Int + protected abstract fun onExecute(okHttpClient: OkHttpClient): Int } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt index 42ddb727..8ae30904 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt @@ -23,7 +23,7 @@ */ package com.owncloud.android.lib.common.http.methods.nonwebdav -import com.owncloud.android.lib.common.http.HttpClient +import okhttp3.OkHttpClient import java.io.IOException import java.net.URL @@ -32,12 +32,12 @@ import java.net.URL * * @author David González Verdugo */ -class DeleteMethod(httpClient: HttpClient, url: URL) : HttpMethod(httpClient, url) { +class DeleteMethod(url: URL) : HttpMethod(url) { @Throws(IOException::class) - override fun onExecute(): Int { + override fun onExecute(okHttpClient: OkHttpClient): Int { request = request.newBuilder() .delete() .build() - return super.onExecute() + return super.onExecute(okHttpClient) } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt index 72da9345..d24c3c88 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt @@ -23,7 +23,7 @@ */ package com.owncloud.android.lib.common.http.methods.nonwebdav -import com.owncloud.android.lib.common.http.HttpClient +import okhttp3.OkHttpClient import java.io.IOException import java.net.URL @@ -32,12 +32,12 @@ import java.net.URL * * @author David González Verdugo */ -class GetMethod(httpClient: HttpClient, url: URL) : HttpMethod(httpClient, url) { +class GetMethod(url: URL) : HttpMethod(url) { @Throws(IOException::class) - override fun onExecute(): Int { + override fun onExecute(okHttpClient: OkHttpClient): Int { request = request.newBuilder() .get() .build() - return super.onExecute() + return super.onExecute(okHttpClient) } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.kt index e42f650b..c91f4228 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.kt @@ -23,8 +23,8 @@ */ package com.owncloud.android.lib.common.http.methods.nonwebdav -import com.owncloud.android.lib.common.http.HttpClient import com.owncloud.android.lib.common.http.methods.HttpBaseMethod +import okhttp3.OkHttpClient import okhttp3.Response import java.net.URL @@ -34,13 +34,12 @@ import java.net.URL * @author David González Verdugo */ abstract class HttpMethod( - httpClient: HttpClient, url: URL -) : HttpBaseMethod(httpClient, url) { +) : HttpBaseMethod(url) { override lateinit var response: Response - public override fun onExecute(): Int { + public override fun onExecute(okHttpClient: OkHttpClient): Int { call = okHttpClient.newCall(request) call?.let { response = it.execute() } return super.statusCode diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt index b4357926..5b51c32f 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt @@ -23,7 +23,7 @@ */ package com.owncloud.android.lib.common.http.methods.nonwebdav -import com.owncloud.android.lib.common.http.HttpClient +import okhttp3.OkHttpClient import okhttp3.RequestBody import java.io.IOException import java.net.URL @@ -34,15 +34,14 @@ import java.net.URL * @author David González Verdugo */ class PostMethod( - httpClient: HttpClient, url: URL, private val postRequestBody: RequestBody -) : HttpMethod(httpClient, url) { +) : HttpMethod(url) { @Throws(IOException::class) - override fun onExecute(): Int { + override fun onExecute(okHttpClient: OkHttpClient): Int { request = request.newBuilder() .post(postRequestBody) .build() - return super.onExecute() + return super.onExecute(okHttpClient) } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt index 6ea784df..91723b69 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt @@ -23,7 +23,7 @@ */ package com.owncloud.android.lib.common.http.methods.nonwebdav -import com.owncloud.android.lib.common.http.HttpClient +import okhttp3.OkHttpClient import okhttp3.RequestBody import java.io.IOException import java.net.URL @@ -34,15 +34,14 @@ import java.net.URL * @author David González Verdugo */ class PutMethod( - httpClient: HttpClient, url: URL, private val putRequestBody: RequestBody -) : HttpMethod(httpClient, url) { +) : HttpMethod(url) { @Throws(IOException::class) - override fun onExecute(): Int { + override fun onExecute(okHttpClient: OkHttpClient): Int { request = request.newBuilder() .put(putRequestBody) .build() - return super.onExecute() + return super.onExecute(okHttpClient) } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.kt index 9633ac0d..d10718e0 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.kt @@ -23,7 +23,7 @@ */ package com.owncloud.android.lib.common.http.methods.webdav -import com.owncloud.android.lib.common.http.HttpClient +import at.bitfire.dav4jvm.DavOCResource import okhttp3.Response import java.net.URL @@ -34,13 +34,12 @@ import java.net.URL * @author David González Verdugo */ class CopyMethod( - httpClient: HttpClient, val url: URL, private val destinationUrl: String, private val forceOverride: Boolean -) : DavMethod(httpClient, url) { +) : DavMethod(url) { @Throws(Exception::class) - public override fun onExecute(): Int { + public override fun onDavExecute(davResource: DavOCResource): Int { davResource.copy( destinationUrl, forceOverride, diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.kt index e975f530..100177ec 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.kt @@ -27,45 +27,39 @@ import at.bitfire.dav4jvm.Dav4jvm.log import at.bitfire.dav4jvm.DavOCResource import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.dav4jvm.exception.RedirectException -import com.owncloud.android.lib.common.http.HttpClient import com.owncloud.android.lib.common.http.HttpConstants import com.owncloud.android.lib.common.http.methods.HttpBaseMethod -import okhttp3.HttpUrl -import okhttp3.HttpUrl.Companion.toHttpUrlOrNull +import okhttp3.OkHttpClient import okhttp3.Protocol import okhttp3.Response import okhttp3.ResponseBody.Companion.toResponseBody -import java.net.MalformedURLException import java.net.URL -import java.util.concurrent.TimeUnit /** * Wrapper to perform WebDAV (dav4android) calls * * @author David González Verdugo */ -abstract class DavMethod protected constructor(httpClient: HttpClient, url: URL) : HttpBaseMethod(httpClient, url) { - protected var davResource: DavOCResource - +abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) { override lateinit var response: Response - - init { - val httpUrl = url.toHttpUrlOrNull() ?: throw MalformedURLException() - davResource = DavOCResource( - okHttpClient, - httpUrl, - log - ) - } + private var davResource: DavOCResource? = null override fun abort() { - davResource.cancelCall() + davResource?.cancelCall() } + protected abstract fun onDavExecute(davResource: DavOCResource): Int + @Throws(Exception::class) - override fun execute(): Int { + override fun onExecute(okHttpClient: OkHttpClient): Int { return try { - onExecute() + davResource = DavOCResource( + okHttpClient.newBuilder().followRedirects(false).build(), + httpUrl, + log + ) + + onDavExecute(davResource!!) } catch (httpException: HttpException) { // Modify responses with information gathered from exceptions if (httpException is RedirectException) { @@ -92,71 +86,12 @@ abstract class DavMethod protected constructor(httpClient: HttpClient, url: URL) } } - ////////////////////////////// - // Setter - ////////////////////////////// - // Connection parameters - override fun setReadTimeout(readTimeout: Long, timeUnit: TimeUnit) { - super.setReadTimeout(readTimeout, timeUnit) - davResource = DavOCResource( - okHttpClient, - request.url, - log - ) - } - - override fun setConnectionTimeout( - connectionTimeout: Long, - timeUnit: TimeUnit - ) { - super.setConnectionTimeout(connectionTimeout, timeUnit) - davResource = DavOCResource( - okHttpClient, - request.url, - log - ) - } - - override fun setFollowRedirects(followRedirects: Boolean) { - super.setFollowRedirects(followRedirects) - davResource = DavOCResource( - okHttpClient, - request.url, - log - ) - } - - override fun setUrl(url: HttpUrl) { - super.setUrl(url) - davResource = DavOCResource( - okHttpClient, - request.url, - log - ) - } - - override fun setRequestHeader(name: String, value: String) { - super.setRequestHeader(name, value) - davResource = DavOCResource( - okHttpClient, - request.url, - log - ) - } - ////////////////////////////// // Getter ////////////////////////////// - override fun setRetryOnConnectionFailure(retryOnConnectionFailure: Boolean) { - super.setRetryOnConnectionFailure(retryOnConnectionFailure) - davResource = DavOCResource( - okHttpClient, - request.url, - log - ) - } + override val isAborted: Boolean - get() = davResource.isCallAborted() + get() = davResource?.isCallAborted() ?: false } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.kt index 7f1f50aa..8d77cd3a 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.kt @@ -23,7 +23,7 @@ */ package com.owncloud.android.lib.common.http.methods.webdav -import com.owncloud.android.lib.common.http.HttpClient +import at.bitfire.dav4jvm.DavOCResource import okhttp3.Response import java.net.URL @@ -33,9 +33,9 @@ import java.net.URL * @author Christian Schabesberger * @author David González Verdugo */ -class MkColMethod(httpClient: HttpClient, url: URL) : DavMethod(httpClient, url) { +class MkColMethod(url: URL) : DavMethod(url) { @Throws(Exception::class) - public override fun onExecute(): Int { + public override fun onDavExecute(davResource: DavOCResource): Int { davResource.mkCol( xmlBody = null, listOfHeaders = super.getRequestHeadersAsHashMap() diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.kt index dac3d712..bc6d9d3e 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.kt @@ -23,7 +23,7 @@ */ package com.owncloud.android.lib.common.http.methods.webdav -import com.owncloud.android.lib.common.http.HttpClient +import at.bitfire.dav4jvm.DavOCResource import okhttp3.Response import java.net.URL @@ -34,13 +34,12 @@ import java.net.URL * @author David González Verdugo */ class MoveMethod( - httpClient: HttpClient, url: URL, private val destinationUrl: String, private val forceOverride: Boolean -) : DavMethod(httpClient, url) { +) : DavMethod(url) { @Throws(Exception::class) - public override fun onExecute(): Int { + override fun onDavExecute(davResource: DavOCResource): Int { davResource.move( destinationUrl, forceOverride, diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.kt index e1404614..6bce3472 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.kt @@ -23,11 +23,11 @@ */ package com.owncloud.android.lib.common.http.methods.webdav +import at.bitfire.dav4jvm.DavOCResource import at.bitfire.dav4jvm.Property import at.bitfire.dav4jvm.Response import at.bitfire.dav4jvm.Response.HrefRelation import at.bitfire.dav4jvm.exception.DavException -import com.owncloud.android.lib.common.http.HttpClient import java.io.IOException import java.net.URL @@ -37,11 +37,10 @@ import java.net.URL * @author David González Verdugo */ class PropfindMethod( - httpClient: HttpClient, url: URL, private val depth: Int, private val propertiesToRequest: Array -) : DavMethod(httpClient, url) { +) : DavMethod(url) { // response val members: MutableList @@ -49,7 +48,7 @@ class PropfindMethod( private set @Throws(IOException::class, DavException::class) - public override fun onExecute(): Int { + public override fun onDavExecute(davResource: DavOCResource): Int { davResource.propfind( depth = depth, reqProp = propertiesToRequest, diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.kt index 56ac10f7..60330a3a 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.kt @@ -23,8 +23,8 @@ */ package com.owncloud.android.lib.common.http.methods.webdav +import at.bitfire.dav4jvm.DavOCResource import at.bitfire.dav4jvm.exception.HttpException -import com.owncloud.android.lib.common.http.HttpClient import com.owncloud.android.lib.common.http.HttpConstants import okhttp3.RequestBody import java.io.IOException @@ -36,12 +36,11 @@ import java.net.URL * @author David González Verdugo */ class PutMethod( - httpClient: HttpClient, url: URL, private val putRequestBody: RequestBody -) : DavMethod(httpClient, url) { +) : DavMethod(url) { @Throws(IOException::class, HttpException::class) - public override fun onExecute(): Int { + public override fun onDavExecute(davResource: DavOCResource): Int { davResource.put( putRequestBody, super.getRequestHeader(HttpConstants.IF_MATCH_HEADER), diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt index 44255c2f..afc88306 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt @@ -57,11 +57,15 @@ class CheckPathExistenceRemoteOperation( if (isUserLoggedIn) client.baseFilesWebDavUri.toString() else client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath) - val propFindMethod = PropfindMethod(client, URL(stringUrl), 0, allPropset).apply { + val propFindMethod = PropfindMethod(URL(stringUrl), 0, allPropset).apply { setReadTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS) setConnectionTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS) } +<<<<<<< HEAD +======= + propFindMethod.followRedirects = false +>>>>>>> 27ecf79c (remove redundant intercept of httpclient with httpmethod) var status = client.executeHttpMethod(propFindMethod) /* PROPFIND method * 404 NOT FOUND: path doesn't exist, diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java index c783c999..9c78425a 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java @@ -92,7 +92,7 @@ public class CopyRemoteFileOperation extends RemoteOperation { RemoteOperationResult result; try { CopyMethod copyMethod = - new CopyMethod(client, + new CopyMethod( new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mSrcRemotePath)), client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath), mOverwrite); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java index 4761dd71..302df20d 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java @@ -87,7 +87,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation { RemoteOperationResult result; try { Uri webDavUri = createChunksFolder ? client.getUploadsWebDavUri() : client.getUserFilesWebDavUri(); - final MkColMethod mkcol = new MkColMethod(client, + final MkColMethod mkcol = new MkColMethod( new URL(webDavUri + WebdavUtils.encodePath(mRemotePath))); mkcol.setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS); mkcol.setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java index 1527ddbb..51ba6b3e 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java @@ -96,7 +96,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation { RemoteOperationResult result; int status; boolean savedFile = false; - mGet = new GetMethod(client, new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath))); + mGet = new GetMethod(new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath))); Iterator it; FileOutputStream fos = null; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java index 5b72141e..46181e8f 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java @@ -100,7 +100,7 @@ public class MoveRemoteFileOperation extends RemoteOperation { // so this uri has to be customizable Uri srcWebDavUri = moveChunkedFile ? client.getUploadsWebDavUri() : client.getUserFilesWebDavUri(); - final MoveMethod move = new MoveMethod(client, + final MoveMethod move = new MoveMethod( new URL(srcWebDavUri + WebdavUtils.encodePath(mSrcRemotePath)), client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath), mOverwrite); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java index 0049ecc4..24496ebe 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java @@ -76,7 +76,7 @@ public class ReadRemoteFileOperation extends RemoteOperation { /// take the duty of check the server for the current state of the file there try { // remote request - propfind = new PropfindMethod(client, + propfind = new PropfindMethod( new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)), DEPTH_0, DavUtils.getAllPropset()); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java index a4213fe5..e10613b3 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java @@ -73,7 +73,6 @@ public class ReadRemoteFolderOperation extends RemoteOperation(ResultCode.INVALID_OVERWRITE); } - final MoveMethod move = new MoveMethod(client, + final MoveMethod move = new MoveMethod( new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mOldRemotePath)), client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mNewRemotePath), false); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromContentUriOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromContentUriOperation.kt index c0e4c108..dfcef34d 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromContentUriOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromContentUriOperation.kt @@ -49,8 +49,8 @@ class UploadFileFromContentUriOperation( ) : RemoteOperation() { override fun run(client: OwnCloudClient): RemoteOperationResult { - val putMethod = PutMethod(client, URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(uploadPath)), requestBody).apply { - setRetryOnConnectionFailure(false) + val putMethod = PutMethod(URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(uploadPath)), requestBody).apply { + retryOnConnectionFailure = false addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, requestBody.contentLength().toString()) addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, lastModified) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java index b9e9881b..43181b28 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java @@ -121,7 +121,7 @@ public class UploadRemoteFileOperation extends RemoteOperation { mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners); } - mPutMethod = new PutMethod(client, + mPutMethod = new PutMethod( new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)), mFileRequestBody); mPutMethod.setRetryOnConnectionFailure(false); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java index e30b70e9..10b8ea36 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java @@ -92,7 +92,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation result = new RemoteOperationResult<>(new OperationCancelledException()); break; } else { - mPutMethod = new PutMethod(client, + mPutMethod = new PutMethod( new URL(uriPrefix + File.separator + chunkIndex), mFileRequestBody); if (chunkIndex == chunkCount - 1) { diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt index 623c13df..d2fae59e 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt @@ -51,7 +51,7 @@ class GetOIDCDiscoveryRemoteOperation : RemoteOperation() appendPath(OPENID_CONFIGURATION_RESOURCE) }.build() - val getMethod = GetMethod(client, URL(uriBuilder.toString())).apply { + val getMethod = GetMethod(URL(uriBuilder.toString())).apply { addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/RegisterClientRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/RegisterClientRemoteOperation.kt index 3cf6ce2a..5d6482da 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/RegisterClientRemoteOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/RegisterClientRemoteOperation.kt @@ -48,7 +48,6 @@ class RegisterClientRemoteOperation( val requestBody = clientRegistrationParams.toRequestBody() val postMethod = PostMethod( - httpClient = client, url = URL(clientRegistrationParams.registrationEndpoint), postRequestBody = requestBody ) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt index b74b9adb..67253c4c 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt @@ -52,7 +52,7 @@ class TokenRequestRemoteOperation( try { val requestBody = tokenRequestParams.toRequestBody() - val postMethod = PostMethod(client, URL(tokenRequestParams.tokenEndpoint), requestBody) + val postMethod = PostMethod(URL(tokenRequestParams.tokenEndpoint), requestBody) postMethod.addRequestHeader(AUTHORIZATION_HEADER, tokenRequestParams.clientAuth) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt index fc2009bf..ed2b7417 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt @@ -171,7 +171,7 @@ class CreateRemoteShareOperation( override fun run(client: OwnCloudClient): RemoteOperationResult { val requestUri = buildRequestUri(client.baseUri) - val postMethod = PostMethod(client, URL(requestUri.toString()), createFormBody()).apply { + val postMethod = PostMethod(URL(requestUri.toString()), createFormBody()).apply { setRequestHeader(HttpConstants.CONTENT_TYPE_HEADER, HttpConstants.CONTENT_TYPE_URLENCODED_UTF8) addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java deleted file mode 100644 index 2746b741..00000000 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java +++ /dev/null @@ -1,94 +0,0 @@ -/* ownCloud Android Library is available under MIT license - * @author David A. Velasco - * @author David González Verdugo - * 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.shares; - -import android.net.Uri; - -import com.owncloud.android.lib.common.OwnCloudClient; -import com.owncloud.android.lib.common.http.HttpConstants; -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.RemoteOperationResult; -import timber.log.Timber; - -import java.net.URL; - -/** - * Get the data about a Share resource, known its remote ID. - * - * @author David A. Velasco - * @author David González Verdugo - */ - -public class GetRemoteShareOperation extends RemoteOperation { - - private String mRemoteId; - - public GetRemoteShareOperation(String remoteId) { - mRemoteId = remoteId; - } - - @Override - protected RemoteOperationResult run(OwnCloudClient client) { - RemoteOperationResult result; - - try { - Uri requestUri = client.getBaseUri(); - Uri.Builder uriBuilder = requestUri.buildUpon(); - uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH); - uriBuilder.appendEncodedPath(mRemoteId); - - GetMethod getMethod = new GetMethod(client, new URL(uriBuilder.build().toString())); - getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE); - - int status = client.executeHttpMethod(getMethod); - - if (isSuccess(status)) { - // Parse xml response and obtain the list of shares - ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser( - new ShareXMLParser() - ); - parser.setOneOrMoreSharesRequired(true); - parser.setOwnCloudVersion(client.getOwnCloudVersion()); - parser.setServerBaseUri(client.getBaseUri()); - result = parser.parse(getMethod.getResponseBodyAsString()); - - } else { - result = new RemoteOperationResult<>(getMethod); - } - - } catch (Exception e) { - result = new RemoteOperationResult<>(e); - Timber.e(e, "Exception while getting remote shares"); - } - return result; - } - - private boolean isSuccess(int status) { - return (status == HttpConstants.HTTP_OK); - } -} \ No newline at end of file diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt index 5df5b09f..10154820 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt @@ -131,7 +131,7 @@ class GetRemoteShareesOperation override fun run(client: OwnCloudClient): RemoteOperationResult { val requestUri = buildRequestUri(client.baseUri) - val getMethod = GetMethod(client, URL(requestUri.toString())) + val getMethod = GetMethod(URL(requestUri.toString())) getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) return try { diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.kt index ab290d22..adb4374e 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.kt @@ -119,7 +119,7 @@ class GetRemoteSharesForFileOperation( override fun run(client: OwnCloudClient): RemoteOperationResult { val requestUri = buildRequestUri(client.baseUri) - val getMethod = GetMethod(client, URL(requestUri.toString())).apply { + val getMethod = GetMethod(URL(requestUri.toString())).apply { addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt index e2dbfc16..304ead67 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt @@ -107,7 +107,7 @@ class RemoveRemoteShareOperation(private val remoteShareId: String) : RemoteOper val requestUri = buildRequestUri(client.baseUri) - val deleteMethod = DeleteMethod(client, URL(requestUri.toString())).apply { + val deleteMethod = DeleteMethod(URL(requestUri.toString())).apply { addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt index aa4b1c8e..a6cc71e3 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt @@ -195,17 +195,17 @@ class UpdateRemoteShareOperation return formBodyBuilder } + override fun run(client: OwnCloudClient): RemoteOperationResult { val requestUri = buildRequestUri(client.baseUri) val formBodyBuilder = createFormBodyBuilder() - val putMethod = PutMethod(client, URL(requestUri.toString()), formBodyBuilder.build()).apply { + val putMethod = PutMethod(URL(requestUri.toString()), formBodyBuilder.build()).apply { setRequestHeader(HttpConstants.CONTENT_TYPE_HEADER, HttpConstants.CONTENT_TYPE_URLENCODED_UTF8) addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) } - return try { val status = client.executeHttpMethod(putMethod) val response = putMethod.getResponseBodyAsString() diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt index 987c07ed..8591a68a 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt @@ -60,7 +60,7 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { appendEncodedPath(OCS_ROUTE) // avoid starting "/" in this method appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT) } - val getMethod = GetMethod(client, URL(uriBuilder.build().toString())).apply { + val getMethod = GetMethod(URL(uriBuilder.build().toString())).apply { addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) } val status = client.executeHttpMethod(getMethod) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt index 66517813..a63aec5a 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt @@ -65,7 +65,7 @@ internal class StatusRequester { } private fun getGetMethod(client: HttpClient, url: String): GetMethod { - return GetMethod(client, URL(url)).apply { + return GetMethod(URL(url)).apply { setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS) setConnectionTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt index a1c84724..f7ffdaf3 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.kt @@ -52,7 +52,7 @@ class GetRemoteUserAvatarOperation(private val avatarDimension: Int) : RemoteOpe client.baseUri.toString() + NON_OFFICIAL_AVATAR_PATH + client.credentials.username + File.separator + avatarDimension Timber.d("avatar URI: %s", endPoint) - val getMethod = GetMethod(client, URL(endPoint)) + val getMethod = GetMethod(URL(endPoint)) val status = client.executeHttpMethod(getMethod) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt index b7e86652..d1f2a43c 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt @@ -51,7 +51,7 @@ class GetRemoteUserInfoOperation : RemoteOperation() { var result: RemoteOperationResult //Get the user try { - val getMethod = GetMethod(client, URL(client.baseUri.toString() + OCS_ROUTE)) + val getMethod = GetMethod(URL(client.baseUri.toString() + OCS_ROUTE)) val status = client.executeHttpMethod(getMethod) val response = getMethod.getResponseBodyAsString() ?: "" if (status == HttpConstants.HTTP_OK) { diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.kt index 77858191..2607bd92 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.kt @@ -50,7 +50,6 @@ class GetRemoteUserQuotaOperation : RemoteOperation() { override fun run(client: OwnCloudClient): RemoteOperationResult = try { val propfindMethod = PropfindMethod( - client, URL(client.userFilesWebDavUri.toString()), DavConstants.DEPTH_0, DavUtils.quotaPropSet