Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/android-library.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÁlvaro Brey <alvaro.brey@nextcloud.com>2022-11-08 15:16:34 +0300
committerÁlvaro Brey <alvaro.brey@nextcloud.com>2022-11-08 15:16:34 +0300
commit9cc80e160a2eeefea3d4a6a28f5da6da2aa15d92 (patch)
treea29d126bcef760e9d0052525b7356ad860af1aba
parent12982fe8a02b99cc6e681b454466ae15bc538b71 (diff)
ChunkedFileRemoteOperation: correctly use lastModificationTimestampfix/upload-chunk-mtime
Otherwise the age of the copied file is used instead, which may not be desired. Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
-rw-r--r--library/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java2
-rw-r--r--library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java2
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 227d3301..6d93a9f2 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 @@ public class ChunkedFileUploadRemoteOperation extends UploadFileRemoteOperation
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 fe87377f..c1a55ab3 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<String> {
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;