Commit graph

248 commits

Author SHA1 Message Date
ashilkn
ad2502c20a minor change 2022-09-09 17:21:11 +05:30
ashilkn
eea38d6857 Merge branch 'rewrite_device_sync_remote' of https://github.com/ente-io/frame into incremental-migration-to-null-safety 2022-09-09 17:10:02 +05:30
Neeraj Gupta
44d7c62033
remove unused code 2022-09-09 16:20:12 +05:30
Neeraj Gupta
1777bca27e
Show files pending for upload on main screen 2022-09-09 16:04:42 +05:30
Neeraj Gupta
0612c5590c
remove redundant check in debug mode 2022-09-09 15:21:27 +05:30
Neeraj Gupta
01c29037dd
Handle cancellation for uploads when folder is unmarked for backup 2022-09-09 15:04:09 +05:30
Neeraj Gupta
83067bc523
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-08 10:50:27 +05:30
Neeraj Gupta
3c6acb85ba
Merge branch 'master' into rewrite_device_sync 2022-09-08 10:49:21 +05:30
ashilkn
c1722959e7 resolve merge conflicts 2022-09-07 17:56:24 +05:30
ashilkn
eb7c1ec837 started incremental migration to null safety 2022-09-07 14:00:09 +05:30
Neeraj Gupta
591e8ba1d9
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-07 13:50:43 +05:30
Neeraj Gupta
1d3ce385ec
Merge branch 'master' into rewrite_device_sync 2022-09-07 13:49:13 +05:30
Neeraj Gupta
010982a0c0
store device collection upload strategy 2022-09-07 11:33:48 +05:30
Neeraj Gupta
29a0ebad8e
By default, only add to collection if file not already uploaded 2022-09-07 10:58:50 +05:30
ashilkn
dad8a9c234 minor changes 2022-09-07 07:26:51 +05:30
ashilkn
c385b32250 bug fix to show collection name in file info for incoming shared albums 2022-09-07 06:45:42 +05:30
Neeraj Gupta
e9e57a6f75
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-06 23:11:04 +05:30
Neeraj Gupta
f61ee05fbf
Merge branch 'master' into rewrite_device_sync 2022-09-06 22:14:25 +05:30
ashilkn
a85f2229a7 show all collection of file in file info + remaned RawExifButton file 2022-09-06 16:57:39 +05:30
Neeraj Gupta
23336ddd5d
Fix query for android 2022-09-04 17:45:08 +05:30
Neeraj Gupta
536d8b0440
Rewrite storeDiff logic to fix matching bugs 2022-09-04 17:12:22 +05:30
Neeraj Gupta
1ad387979e
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-02 14:12:46 +05:30
Neeraj Gupta
298c94bb65
Merge branch 'match_bug_fix' into rewrite_device_sync 2022-09-02 14:12:14 +05:30
Neeraj Gupta
3baafc72fb
Fix: Set localID for all files with same uploadedFileID 2022-09-02 13:12:46 +05:30
Neeraj Gupta
81beff6f1d
Merge pull request #415 from ente-io/reupload_hash_check
[Part-0] Rewrite Sync: Use hash to avoid duplicate uploads
2022-09-02 12:07:45 +05:30
Neeraj Gupta
b15c8528db
minor rename 2022-09-01 20:46:57 +05:30
Neeraj Gupta
567804f0f9
minor formatting and rename 2022-09-01 20:39:47 +05:30
Neeraj Gupta
7a18d3ab38
make final 2022-09-01 15:11:50 +05:30
Neeraj Gupta
afc057953d
minor refactor and bug fixes 2022-09-01 14:49:35 +05:30
Neeraj Gupta
eec540af93
review changes 2022-09-01 14:17:57 +05:30
Neeraj Gupta
226c064d82
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-01 09:45:17 +05:30
Neeraj Gupta
c0f47ec0e9
Merge branch 'master' into rewrite_device_sync_remote 2022-09-01 09:05:04 +05:30
Neeraj Gupta
6afe51b6f3
remove unused synced col from device_files 2022-09-01 01:27:48 +05:30
Neeraj Gupta
40c76edbc5
remove unused method 2022-09-01 00:12:24 +05:30
Neeraj Gupta
dc0c856a4c
rename DevicePathCollection to DeviceCollection 2022-09-01 00:09:39 +05:30
Neeraj Gupta
e09e585c5f
Merge branch 'reupload_hash_check' into rewrite_device_sync 2022-08-31 23:58:48 +05:30
Neeraj Gupta
4ee0bebf73
Fix query in getFileCountInDeviceFolders 2022-08-31 23:50:00 +05:30
Neeraj Gupta
cddcc786dc
Merge branch 'master' into reupload_hash_check 2022-08-31 23:16:12 +05:30
Ashil Kandapath
d780752028 minor changes 2022-08-30 13:46:40 +05:30
Neeraj Gupta
cfc55d7df3
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-08-30 13:11:35 +05:30
Neeraj Gupta
19832b82b5
Merge branch 'master' into rewrite_device_sync_remote 2022-08-30 13:03:54 +05:30
Ashil Kandapath
5850074120 minor changes 2022-08-30 12:13:51 +05:30
Ashil Kandapath
d81c43268b resolved merge conflicts 2022-08-30 11:44:57 +05:30
Neeraj Gupta
2bbacb26ee
mark variables as final when possible 2022-08-29 23:35:13 +05:30
Neeraj Gupta
1533ac4098
Merge branch 'reupload_hash_check' into rewrite_device_sync 2022-08-29 23:32:00 +05:30
Neeraj Gupta
792dd67ade
Merge branch 'master' into reupload_hash_check 2022-08-29 23:20:21 +05:30
Neeraj Gupta
531b4a0490
add review comments 2022-08-29 23:13:17 +05:30
Ashil Kandapath
a278df2f23 exclude collectionID = -1 rows while querying for c-ids of hidden files 2022-08-29 20:14:07 +05:30
vishnukvmd
06ec7cb658 final all the vars! 2022-08-29 20:13:31 +05:30
Neeraj Gupta
68738c5c56
Refactor fileHash handling 2022-08-29 13:28:49 +05:30