Skip to content

ChunkedFileRemoteOperation: correctly use lastModificationTimestamp #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 16, 2022
Merged

ChunkedFileRemoteOperation: correctly use lastModificationTimestamp #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0331d71
ChunkedFileRemoteOperation: correctly use lastModificationTimestamp
AlvaroBrey Nov 8, 2022
08b0ac2
Add comment specifying that lastModificationTimestamp is in seconds
AlvaroBrey Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
5 changes: 4 additions & 1 deletion ...ary/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down