Removed patchAsync request when not useful for Onedrive

Author: JustFanta01

data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt

@@ -34,7 +34,6 @@ import org.cryptomator.domain.usecases.cloud.DataSource
 import org.cryptomator.domain.usecases.cloud.DownloadState
 import org.cryptomator.domain.usecases.cloud.Progress
 import org.cryptomator.domain.usecases.cloud.UploadState
-import org.cryptomator.util.Optional
 import org.cryptomator.util.SharedPreferencesHandler
 import org.cryptomator.util.file.LruFileCacheUtil
 import org.cryptomator.util.file.LruFileCacheUtil.Companion.retrieveFromLruCache
@@ -206,19 +205,19 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 		}
 		progressAware.onProgress(Progress.completed(UploadState.upload(file)))
 		return try {
-			val lastModifiedDate = getLastModifiedDateTime(result.get().fileSystemInfo)
-			OnedriveCloudNodeFactory.file(file.parent, result.get(), lastModifiedDate)
+			val driveItem: DriveItem = result.get()
+			val lastModifiedDate = getLastModifiedDateTime(driveItem) ?: Date()
+			OnedriveCloudNodeFactory.file(file.parent, driveItem, lastModifiedDate)
 		} catch (e: ExecutionException) {
 			throw FatalBackendException(e)
 		} catch (e: InterruptedException) {
 			throw FatalBackendException(e)
 		}
 	}
 
-	private fun getLastModifiedDateTime(fileSystemInfo: FileSystemInfo?): Date {
-		return fileSystemInfo?.lastModifiedDateTime.let { date ->
-			Date.from(date?.toInstant())
-		}?: Date.from(Date().toInstant())
+	private fun getLastModifiedDateTime(driveItem: DriveItem): Date? {
+		return driveItem.fileSystemInfo?.lastModifiedDateTime?.let { clientDate -> Date.from(clientDate.toInstant()) }
+			?: driveItem.lastModifiedDateTime?.let { serverDate -> Date.from(serverDate.toInstant()) }
 	}
 
 	@Throws(NoSuchCloudFileException::class)
@@ -239,14 +238,13 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 						.putAsync(CopyStream.toByteArray(it)) //
 						.whenComplete { driveItem, error ->
 							run {
-								if (error == null) {
-									val diffItem = DriveItem()
-									diffItem.fileSystemInfo = FileSystemInfo()
-									setLastModifiedDateTime(diffItem.fileSystemInfo, data.modifiedDate(context))
-									drive(parentNodeInfo.driveId) //
-										.items(driveItem.id!!) //
-										.buildRequest(conflictBehaviorOption) //
-										.patchAsync(diffItem) //
+								val modifiedDate = data.modifiedDate(context)
+								if (error != null) {
+									result.completeExceptionally(error)
+									return@whenComplete
+								}
+								if (modifiedDate.isPresent) {
+									patchAsyncLastModifiedDate(parentNodeInfo, driveItem, modifiedDate.get())
 										.whenComplete { driveItem, error ->
 											if (error == null) {
 												progressAware.onProgress(Progress.completed(UploadState.upload(file)))
@@ -256,10 +254,11 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 												result.completeExceptionally(error)
 											}
 										}
-								} else {
-									result.completeExceptionally(error)
+								} else { // current date is the default, no need to patch()
+									progressAware.onProgress(Progress.completed(UploadState.upload(file)))
+									result.complete(driveItem)
+									cacheNodeInfo(file, driveItem)
 								}
-
 							}
 						}
 				} catch (e: IOException) {
@@ -269,13 +268,27 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 		} ?: throw FatalBackendException("InputStream shouldn't bee null")
 	}
 
+	private fun patchAsyncLastModifiedDate(parentNodeInfo: OnedriveIdCache.NodeInfo, driveItem: DriveItem, modifiedDate: Date): CompletableFuture<DriveItem> {
+		val diffItem = DriveItem()
+		diffItem.fileSystemInfo = FileSystemInfo()
+		diffItem.fileSystemInfo!!.lastModifiedDateTime = OffsetDateTime.ofInstant(modifiedDate.toInstant(), ZoneId.systemDefault())
+		return drive(parentNodeInfo.driveId) //
+			.items(driveItem.id!!) //
+			.buildRequest() //
+			.patchAsync(diffItem) //
+	}
+
 	@Throws(IOException::class, NoSuchCloudFileException::class)
 	private fun chunkedUploadFile(file: OnedriveFile, data: DataSource, progressAware: ProgressAware<UploadState>, result: CompletableFuture<DriveItem>, conflictBehaviorOption: Option, size: Long) {
 		val parentNodeInfo = requireNodeInfo(file.parent)
 
 		val props = DriveItemUploadableProperties()
-		props.fileSystemInfo = FileSystemInfo()
-		setLastModifiedDateTime(props.fileSystemInfo, data.modifiedDate(context))
+		val modifiedDate = data.modifiedDate(context)
+
+		if (modifiedDate.isPresent) {
+			props.fileSystemInfo = FileSystemInfo()
+			props.fileSystemInfo!!.lastModifiedDateTime = OffsetDateTime.ofInstant(modifiedDate.get().toInstant(), ZoneId.systemDefault())
+		}
 
 		drive(parentNodeInfo.driveId) //
 			.items(parentNodeInfo.id) //
@@ -304,14 +317,6 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 			} ?: throw FatalBackendException("Failed to create upload session, response is null")
 	}
 
-	private fun setLastModifiedDateTime(fileSystemInfo: FileSystemInfo?, modifiedDate: Optional<Date>) {
-		fileSystemInfo?.lastModifiedDateTime = modifiedDate.map { date ->
-			OffsetDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault())
-		}.orElseGet {
-			OffsetDateTime.ofInstant(Date().toInstant(), ZoneId.systemDefault())
-		}
-	}
-
 	@Throws(BackendException::class, IOException::class)
 	fun read(file: OnedriveFile, encryptedTmpFile: File?, data: OutputStream, progressAware: ProgressAware<DownloadState>) {
 		progressAware.onProgress(Progress.started(DownloadState.download(file)))

data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavClient.kt

@@ -12,7 +12,6 @@ import org.cryptomator.domain.exception.NotFoundException
 import org.cryptomator.domain.exception.ParentFolderDoesNotExistException
 import org.cryptomator.domain.exception.TypeMismatchException
 import org.cryptomator.domain.exception.UnauthorizedException
-import org.cryptomator.util.Optional
 import org.xmlpull.v1.XmlPullParserException
 import java.io.ByteArrayInputStream
 import java.io.IOException