Merge pull request #985 from nextcloud/fix/upload-chunk-mtime

ChunkedFileRemoteOperation: correctly use lastModificationTimestamp
nextcloud · Nov 16, 2022 · d2b81dd · d2b81dd
2 parents e39a3c4 + 08b0ac2
commit d2b81dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.../main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java b/.../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/...ary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java b/...ary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java
@@ -64,7 +64,10 @@ public class UploadFileRemoteOperation extends RemoteOperation<String> {
     protected String localPath;
     protected String remotePath;
     protected String mimeType;
-    private String lastModificationTimestamp;
+    /**
+     * Must be in seconds, according to UNIX time
+     */
+    protected String lastModificationTimestamp;
     protected Long creationTimestamp = null;
     protected boolean disableRetries = false;
     PutMethod putMethod = null;