From ffe7d9d8e334f081fa0a4b20e3d4ebc8b78954b3 Mon Sep 17 00:00:00 2001 From: agarcia Date: Fri, 19 Jun 2020 14:27:00 +0200 Subject: [PATCH] Update dav4android and okttp versions to 4.6.0 --- README.md | 4 ++-- owncloudComLibrary/build.gradle | 4 ++-- .../android/lib/common/OwnCloudClient.java | 2 +- .../OwnCloudBasicCredentials.java | 5 +++-- .../common/http/methods/webdav/DavMethod.java | 20 +++++++++---------- .../common/http/methods/webdav/DavUtils.java | 4 ++-- .../http/methods/webdav/PropfindMethod.java | 6 +++--- .../common/http/methods/webdav/PutMethod.java | 2 +- .../operations/RemoteOperationResult.java | 4 ++-- .../CheckPathExistenceRemoteOperation.kt | 4 ++-- .../files/ReadRemoteFolderOperation.java | 2 +- .../lib/resources/files/RemoteFile.java | 16 +++------------ .../lib/resources/files/RemoteFileUtil.kt | 2 +- 13 files changed, 33 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 7a29cb82..b86531b1 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,11 @@ ownCloud Android Library is available under MIT license. See the file LICENSE.md #### Third party libraries -ownCloud Android Library uses OkHttp version 3.10, licensed under Apache License and version 2.0. Besides, it uses Dav4Android, licensed under Mozilla Public License, v. 2.0 +ownCloud Android Library uses OkHttp version 4.6.0, licensed under Apache License and version 2.0. Besides, it uses Dav4Android, licensed under Mozilla Public License, v. 2.0 ### Compatibility -ownCloud Android Library is valid for Android systems from version Android 2.2 (android:minSdkVersion="8" android:targetSdkVersion="19"). +ownCloud Android Library is valid for Android systems from version Android 5 (android:minSdkVersion="21" android:targetSdkVersion="29"). ownCloud Android library supports ownCloud server from version 4.5. diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle index 3559bbf3..a75309e4 100644 --- a/owncloudComLibrary/build.gradle +++ b/owncloudComLibrary/build.gradle @@ -4,9 +4,9 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' dependencies { - api 'com.squareup.okhttp3:okhttp:3.12.0' + api 'com.squareup.okhttp3:okhttp:4.6.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" - api 'com.gitlab.ownclouders:dav4android:oc_support_1.0.1' + api 'com.gitlab.ownclouders:dav4android:oc_support_2.1' api 'com.github.hannesa2:Logcat:1.6.0' api 'net.openid:appauth:0.7.1' 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 3ab812d4..7e2691d3 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 @@ -29,7 +29,7 @@ import android.accounts.AccountManager; import android.accounts.AccountsException; import android.net.Uri; -import at.bitfire.dav4android.exception.HttpException; +import at.bitfire.dav4jvm.exception.HttpException; import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.authentication.OwnCloudCredentials; import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java index af3e9d75..bde053ce 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java @@ -27,7 +27,8 @@ import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.http.HttpClient; import com.owncloud.android.lib.common.http.HttpConstants; import okhttp3.Credentials; -import okhttp3.internal.Util; + +import static java.nio.charset.StandardCharsets.UTF_8; public class OwnCloudBasicCredentials implements OwnCloudCredentials { @@ -51,7 +52,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials { HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER); HttpClient.addHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER, - Credentials.basic(mUsername, mPassword, Util.UTF_8)); + Credentials.basic(mUsername, mPassword, UTF_8)); } @Override diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java index 4255e1a6..1334e327 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java @@ -24,10 +24,10 @@ package com.owncloud.android.lib.common.http.methods.webdav; -import at.bitfire.dav4android.Constants; -import at.bitfire.dav4android.DavOCResource; -import at.bitfire.dav4android.exception.HttpException; -import at.bitfire.dav4android.exception.RedirectException; +import at.bitfire.dav4jvm.Dav4jvm; +import at.bitfire.dav4jvm.DavOCResource; +import at.bitfire.dav4jvm.exception.HttpException; +import at.bitfire.dav4jvm.exception.RedirectException; import com.owncloud.android.lib.common.http.HttpConstants; import com.owncloud.android.lib.common.http.methods.HttpBaseMethod; import okhttp3.HttpUrl; @@ -52,7 +52,7 @@ public abstract class DavMethod extends HttpBaseMethod { mDavResource = new DavOCResource( mOkHttpClient, HttpUrl.parse(url.toString()), - Constants.INSTANCE.getLog()); + Dav4jvm.INSTANCE.getLog()); } @Override @@ -107,7 +107,7 @@ public abstract class DavMethod extends HttpBaseMethod { mDavResource = new DavOCResource( mOkHttpClient, HttpUrl.parse(mRequest.url().toString()), - Constants.INSTANCE.getLog()); + Dav4jvm.INSTANCE.getLog()); } @Override @@ -116,7 +116,7 @@ public abstract class DavMethod extends HttpBaseMethod { mDavResource = new DavOCResource( mOkHttpClient, HttpUrl.parse(mRequest.url().toString()), - Constants.INSTANCE.getLog()); + Dav4jvm.INSTANCE.getLog()); } @Override @@ -125,7 +125,7 @@ public abstract class DavMethod extends HttpBaseMethod { mDavResource = new DavOCResource( mOkHttpClient, HttpUrl.parse(mRequest.url().toString()), - Constants.INSTANCE.getLog()); + Dav4jvm.INSTANCE.getLog()); } @Override @@ -134,7 +134,7 @@ public abstract class DavMethod extends HttpBaseMethod { mDavResource = new DavOCResource( mOkHttpClient, HttpUrl.parse(mRequest.url().toString()), - Constants.INSTANCE.getLog()); + Dav4jvm.INSTANCE.getLog()); } @Override @@ -152,7 +152,7 @@ public abstract class DavMethod extends HttpBaseMethod { mDavResource = new DavOCResource( mOkHttpClient, HttpUrl.parse(mRequest.url().toString()), - Constants.INSTANCE.getLog()); + Dav4jvm.INSTANCE.getLog()); } @Override diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java index 484c4ec1..abeca753 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java @@ -1,7 +1,7 @@ package com.owncloud.android.lib.common.http.methods.webdav; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyUtils; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.PropertyUtils; public class DavUtils { diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java index 6a48fc80..319b051c 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java @@ -24,9 +24,9 @@ package com.owncloud.android.lib.common.http.methods.webdav; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.Response; -import at.bitfire.dav4android.exception.DavException; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.Response; +import at.bitfire.dav4jvm.exception.DavException; import kotlin.Unit; import java.io.IOException; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java index 243a4d5a..cb93bc87 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java @@ -24,7 +24,7 @@ package com.owncloud.android.lib.common.http.methods.webdav; -import at.bitfire.dav4android.exception.HttpException; +import at.bitfire.dav4jvm.exception.HttpException; import com.owncloud.android.lib.common.http.HttpConstants; import kotlin.Unit; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java index 715ed32c..64386964 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -27,8 +27,8 @@ package com.owncloud.android.lib.common.operations; import android.accounts.Account; import android.accounts.AccountsException; -import at.bitfire.dav4android.exception.DavException; -import at.bitfire.dav4android.exception.HttpException; +import at.bitfire.dav4jvm.exception.DavException; +import at.bitfire.dav4jvm.exception.HttpException; import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.http.HttpConstants; import com.owncloud.android.lib.common.http.methods.HttpBaseMethod; 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 aafa5fc7..e419cca4 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 @@ -25,7 +25,7 @@ package com.owncloud.android.lib.resources.files import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.http.HttpConstants -import com.owncloud.android.lib.common.http.methods.webdav.DavUtils +import com.owncloud.android.lib.common.http.methods.webdav.DavUtils.getAllPropset import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod import com.owncloud.android.lib.common.network.RedirectionPath import com.owncloud.android.lib.common.network.WebdavUtils @@ -66,7 +66,7 @@ class CheckPathExistenceRemoteOperation( if (isUserLogged) client.baseFilesWebDavUri.toString() else client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath) - val propFindMethod = PropfindMethod(URL(stringUrl), 0, DavUtils.getAllPropset()).apply { + val propFindMethod = PropfindMethod(URL(stringUrl), 0, getAllPropset()).apply { setReadTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS) setConnectionTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS) } 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 730bd86b..838cfa00 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 @@ -24,7 +24,7 @@ package com.owncloud.android.lib.resources.files; -import at.bitfire.dav4android.Response; +import at.bitfire.dav4jvm.Response; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.http.HttpConstants; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFile.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFile.java index d52ec1d8..cb390993 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFile.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFile.java @@ -27,19 +27,9 @@ package com.owncloud.android.lib.resources.files; import android.os.Parcel; import android.os.Parcelable; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.Response; -import at.bitfire.dav4android.property.CreationDate; -import at.bitfire.dav4android.property.GetContentLength; -import at.bitfire.dav4android.property.GetContentType; -import at.bitfire.dav4android.property.GetETag; -import at.bitfire.dav4android.property.GetLastModified; -import at.bitfire.dav4android.property.QuotaAvailableBytes; -import at.bitfire.dav4android.property.QuotaUsedBytes; -import at.bitfire.dav4android.property.owncloud.OCId; -import at.bitfire.dav4android.property.owncloud.OCPermissions; -import at.bitfire.dav4android.property.owncloud.OCPrivatelink; -import at.bitfire.dav4android.property.owncloud.OCSize; +import at.bitfire.dav4jvm.Property; +import at.bitfire.dav4jvm.Response; +import at.bitfire.dav4jvm.property.*; import java.io.File; import java.io.Serializable; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFileUtil.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFileUtil.kt index ace0675b..30550e70 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFileUtil.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFileUtil.kt @@ -41,7 +41,7 @@ class RemoteFileUtil { */ fun getRemotePathFromUrl(url: HttpUrl, userId: String): String? { val davFilesPath = OwnCloudClient.WEBDAV_FILES_PATH_4_0 + userId - val absoluteDavPath = Uri.decode(url.encodedPath()) + val absoluteDavPath = Uri.decode(url.encodedPath) val pathToOc = absoluteDavPath.split(davFilesPath)[0] return absoluteDavPath.replace(pathToOc + davFilesPath, "") }