flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 10:27:45 +00:00
Code Issues Releases Wiki Activity

Make requireEtag nullable

Browse Source
This commit is contained in:
Abel García de Prada 2022-01-18 13:11:02 +01:00 committed by Abel García de Prada
parent c6b41e42c5
commit 0de5cd0b38
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileFromFileSystemOperation.kt
View File

@ -55,7 +55,7 @@ open class UploadFileFromFileSystemOperation(
val remotePath: String, val remotePath: String,
val mimeType: String, val mimeType: String,
val lastModifiedTimestamp: String, val lastModifiedTimestamp: String,
val requiredEtag: String, val requiredEtag: String?,
) : RemoteOperation<Unit>() { ) : RemoteOperation<Unit>() {
protected val cancellationRequested = AtomicBoolean(false) protected val cancellationRequested = AtomicBoolean(false)
@ -98,7 +98,7 @@ open class UploadFileFromFileSystemOperation(
putMethod = PutMethod(URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)), fileRequestBody!!).apply { putMethod = PutMethod(URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)), fileRequestBody!!).apply {
setRetryOnConnectionFailure(false) setRetryOnConnectionFailure(false)
if (requiredEtag.isNotBlank()) { if (!requiredEtag.isNullOrBlank()) {
addRequestHeader(HttpConstants.IF_MATCH_HEADER, requiredEtag) addRequestHeader(HttpConstants.IF_MATCH_HEADER, requiredEtag)
} }
addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, fileToUpload.length().toString()) addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, fileToUpload.length().toString())

2
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadFromFileSystemOperation.kt
View File

@ -54,7 +54,7 @@ class ChunkedUploadFromFileSystemOperation(
remotePath: String, remotePath: String,
mimeType: String, mimeType: String,
lastModifiedTimestamp: String, lastModifiedTimestamp: String,
requiredEtag: String, requiredEtag: String?,
) : UploadFileFromFileSystemOperation( ) : UploadFileFromFileSystemOperation(
localPath = localPath, localPath = localPath,
remotePath = remotePath, remotePath = remotePath,