From 0331d7135fafce31a4f7b8343f39bffbc55a6b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Tue, 8 Nov 2022 13:16:34 +0100 Subject: [PATCH 1/2] ChunkedFileRemoteOperation: correctly use lastModificationTimestamp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise the age of the copied file is used instead, which may not be desired. Signed-off-by: Álvaro Brey --- .../lib/resources/files/ChunkedFileUploadRemoteOperation.java | 2 +- .../android/lib/resources/files/UploadFileRemoteOperation.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java index 227d33011..6d93a9f21 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java @@ -207,7 +207,7 @@ protected RemoteOperationResult run(OwnCloudClient client) { String originUri = uploadFolderUri + "/.file"; moveMethod = new MoveMethod(originUri, destinationUri, true); - moveMethod.addRequestHeader(OC_X_OC_MTIME_HEADER, String.valueOf(file.lastModified() / 1000)); + moveMethod.addRequestHeader(OC_X_OC_MTIME_HEADER, lastModificationTimestamp); if (creationTimestamp != null && creationTimestamp > 0) { moveMethod.addRequestHeader(OC_X_OC_CTIME_HEADER, String.valueOf(creationTimestamp)); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java index fe87377f3..c1a55ab39 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java @@ -64,7 +64,7 @@ public class UploadFileRemoteOperation extends RemoteOperation { protected String localPath; protected String remotePath; protected String mimeType; - private String lastModificationTimestamp; + protected String lastModificationTimestamp; protected Long creationTimestamp = null; protected boolean disableRetries = false; PutMethod putMethod = null; From 08b0ac2474586dd509c69ffc1c3c84a20070d1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Wed, 16 Nov 2022 11:11:49 +0100 Subject: [PATCH 2/2] Add comment specifying that lastModificationTimestamp is in seconds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey --- .../android/lib/resources/files/UploadFileRemoteOperation.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java index c1a55ab39..8d87c895e 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java @@ -64,6 +64,9 @@ public class UploadFileRemoteOperation extends RemoteOperation { protected String localPath; protected String remotePath; protected String mimeType; + /** + * Must be in seconds, according to UNIX time + */ protected String lastModificationTimestamp; protected Long creationTimestamp = null; protected boolean disableRetries = false;