From 1f499fb67d418f32871267d677e55015e42459b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= Date: Tue, 18 Jan 2022 13:11:02 +0100 Subject: [PATCH] Make requireEtag nullable --- .../lib/resources/files/UploadFileFromFileSystemOperation.kt | 4 ++-- .../files/chunks/ChunkedUploadFromFileSystemOperation.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromFileSystemOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromFileSystemOperation.kt index e532c678..4a32403d 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromFileSystemOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromFileSystemOperation.kt @@ -55,7 +55,7 @@ open class UploadFileFromFileSystemOperation( val remotePath: String, val mimeType: String, val lastModifiedTimestamp: String, - val requiredEtag: String, + val requiredEtag: String?, ) : RemoteOperation() { protected val cancellationRequested = AtomicBoolean(false) @@ -98,7 +98,7 @@ open class UploadFileFromFileSystemOperation( putMethod = PutMethod(URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)), fileRequestBody!!).apply { setRetryOnConnectionFailure(false) - if (requiredEtag.isNotBlank()) { + if (!requiredEtag.isNullOrBlank()) { addRequestHeader(HttpConstants.IF_MATCH_HEADER, requiredEtag) } addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, fileToUpload.length().toString()) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadFromFileSystemOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadFromFileSystemOperation.kt index cc42b6bf..a7268123 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadFromFileSystemOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadFromFileSystemOperation.kt @@ -54,7 +54,7 @@ class ChunkedUploadFromFileSystemOperation( remotePath: String, mimeType: String, lastModifiedTimestamp: String, - requiredEtag: String, + requiredEtag: String?, ) : UploadFileFromFileSystemOperation( localPath = localPath, remotePath = remotePath,