self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

All: Fixes #3591: Fixed sync fetching issue (#3599)

Browse Source
This commit is contained in:
alexchee 2020-08-07 19:30:11 -04:00 committed by GitHub
parent f99f3f8a6d
commit 8c7a24282c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CliClient/tests/file_api_driver.js
View File

@ -50,6 +50,7 @@ const api = null;
// const items = response.items;
// expect(items.length).toBe(3);
// expect(items[0].path).toBe('1');
// expect(items[0].updated_time).toMatch(/^\d+$/); // make sure it's using epoch timestamp
// }));
// it('should default to only files on root directory', asyncTest(async () => {

3
ReactNativeClient/lib/file-api-driver-amazon-s3.js
View File

@ -145,10 +145,11 @@ class FileApiDriverAmazonS3 {
metadataToStat_(md, path) {
const relativePath = basename(path);
const lastModifiedDate = md['LastModified'] ? new Date(md['LastModified']) : new Date();
const output = {
path: relativePath,
updated_time: md['LastModified'] ? new Date(md['LastModified']) : new Date(),
updated_time: lastModifiedDate.getTime(),
isDeleted: !!md['DeleteMarker'],
isDir: false,
};