AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Save stats request if lastmodify is set in header of write result in S3

Browse Source
This commit is contained in:
Julian Raufelder 2021-05-11 19:13:54 +02:00
parent 98d22547b1
commit d5598c3dd0
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.java
View File

@ -243,14 +243,22 @@ class S3Impl {
}) {
try {
PutObjectArgs putObjectArgs = PutObjectArgs.builder().bucket(cloud.s3Bucket()).object(file.getKey()).stream(out.open(context), data.size(context).get(), -1).build();
client().putObject(putObjectArgs);
StatObjectResponse statObjectResponse = client().statObject(StatObjectArgs //
.builder() //
.bucket(cloud.s3Bucket()) //
.object(file.getKey()) //
.build());
ObjectWriteResponse objectWriteResponse = client().putObject(putObjectArgs);
Date lastModified = objectWriteResponse.headers().getDate("Last-Modified");
if(lastModified == null) {
StatObjectResponse statObjectResponse = client().statObject(StatObjectArgs //
.builder() //
.bucket(cloud.s3Bucket()) //
.object(file.getKey()) //
.build());
lastModified = Date.from(statObjectResponse.lastModified().toInstant());
}
progressAware.onProgress(Progress.completed(UploadState.upload(file)));
return S3CloudNodeFactory.file(file.getParent(), file.getName(), Optional.of(statObjectResponse.size()), Optional.of(Date.from(statObjectResponse.lastModified().toInstant())));
return S3CloudNodeFactory.file(file.getParent(), file.getName(), Optional.of(size), Optional.of(lastModified));
} catch (Exception ex) {
handleApiError(ex, file.getPath());
}