Update dav4android and okttp versions to 4.6.0

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.

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'
 

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;

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

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.dav4jvm.Dav4jvm;
-import at.bitfire.dav4android.DavOCResource;
+import at.bitfire.dav4jvm.DavOCResource;
-import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4jvm.exception.HttpException;
-import at.bitfire.dav4android.exception.RedirectException;
+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

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.dav4jvm.Property;
-import at.bitfire.dav4android.PropertyUtils;
+import at.bitfire.dav4jvm.PropertyUtils;
 
 public class DavUtils {
 

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.dav4jvm.Property;
-import at.bitfire.dav4android.Response;
+import at.bitfire.dav4jvm.Response;
-import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4jvm.exception.DavException;
 import kotlin.Unit;
 
 import java.io.IOException;

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;
 

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.dav4jvm.exception.DavException;
-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.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;

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)
             }

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;

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.dav4jvm.Property;
-import at.bitfire.dav4android.Response;
+import at.bitfire.dav4jvm.Response;
-import at.bitfire.dav4android.property.CreationDate;
+import at.bitfire.dav4jvm.property.*;
-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 java.io.File;
 import java.io.Serializable;

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, "")
         }