Commit graph

3911 commits

Author SHA1 Message Date
Neeraj Gupta 53d1ee491a
Merge pull request #462 from ente-io/fix_sync_ui_status
Fix missing feedback for remote sync
2022-09-05 15:23:09 +05:30
ashilkn 242498b6a6 removed SmallGradientButton 2022-09-05 15:21:39 +05:30
ashilkn 7564322d06 Merge branch 'master' into loading-photos-background-alignment-fix 2022-09-05 15:10:42 +05:30
Ashil 9f71a4c2e7
Merge pull request #459 from ente-io/dedupe-screen-changes
Dedupe screen changes
2022-09-05 15:02:30 +05:30
Neeraj Gupta cf92871a64
minor fix 2022-09-05 14:33:49 +05:30
Neeraj Gupta 491fb0b19a
Fix missing feedback for remote sync 2022-09-05 14:14:21 +05:30
Neeraj Gupta b96c2814af
rename 2022-09-05 13:43:47 +05:30
Neeraj Gupta 4a011b3d56
Improve logic for resetting syncTime 2022-09-05 13:38:10 +05:30
ashilkn 44495c721c center aligned assets + other UI changes 2022-09-05 10:45:14 +05:30
ashilkn bd62f21bd5 lock screen UI layout fix + made SmallGradientButton component 2022-09-05 10:03:29 +05:30
ashilkn ddb71e559e minor UI change 2022-09-05 06:35:04 +05:30
ashilkn f6809cf9be misc. changes 2022-09-05 06:20:06 +05:30
ashilkn f81c8791d4 Merge branch 'master' into handle-cases-for-no-password-on-device 2022-09-05 05:30:00 +05:30
ashilkn 7b3812044d Merge branch 'master' into dedupe-screen-changes 2022-09-05 05:28:23 +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
ashilkn 27ce0a7c76 button text not visible on dark mode fix 2022-09-03 20:14:49 +05:30
ashilkn 145b998294 sort clubbed dedepue files in alphabetical order of collection names 2022-09-03 20:01:46 +05:30
ashilkn 0308dcd665 show album name with dedupe files + UI changes 2022-09-03 19:15:23 +05:30
ashilkn 78ff0b5f30 UI changes for dedupe screen 2022-09-03 18:51:00 +05:30
ashilkn b83411f0bb deselect all option for dedupe screen 2022-09-03 13:20:45 +05:30
ashilkn c1da25fa7a removed commented code + bug fix 2022-09-03 08:32:42 +05:30
ashilkn 18abdb089d Merge branch 'master' into handle-cases-for-no-password-on-device 2022-09-03 07:16:37 +05:30
ashilkn c2272879f1 extracted local authentication to LocalAuthenticationService 2022-09-02 19:50:03 +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 39affe4004
Fire event to remove stale entries 2022-09-02 13:53:49 +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
Ashil 8b28493803
Merge pull request #455 from ente-io/bugFix
Fix minor bugs in share warning for collections with hidden files
2022-09-02 10:57:28 +05:30
Neeraj Gupta f6f812d5cc
update cloud backup icon 2022-09-02 10:34:10 +05:30
Neeraj Gupta 06cc2d083f
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-01 20:57:09 +05:30
Neeraj Gupta a018d33478
minor fixes 2022-09-01 20:56:51 +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 7e6a54d318
ensure photo is not uploaded to Recent whenever possible 2022-09-01 18:11:32 +05:30
Neeraj Gupta 7a18d3ab38
make final 2022-09-01 15:11:50 +05:30
Neeraj Gupta 8dd3acac71
do not show warning if already shared 2022-09-01 15:10:45 +05:30
Neeraj Gupta 9b7c3ec7e0
Fix share collection action for device folder not backed up 2022-09-01 15:09:59 +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 fd9603d3ae
remove redundant param 2022-09-01 13:40:52 +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 a5a135a611
minor rename refactoring 2022-09-01 01:34:02 +05:30
Neeraj Gupta 6afe51b6f3
remove unused synced col from device_files 2022-09-01 01:27:48 +05:30
Neeraj Gupta decbfe0145
Only show deviceFolder on UI if coverFile is found 2022-09-01 01:20:11 +05:30
Neeraj Gupta 718fcdf6cb
Rename device_collection.sync -> should_backup 2022-09-01 00:21:17 +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 046dfc610a
FileUploader: return new or updated file after file linking to existing file 2022-08-31 23:46:04 +05:30
Neeraj Gupta cddcc786dc
Merge branch 'master' into reupload_hash_check 2022-08-31 23:16:12 +05:30
ashilkn c255f02347 show alert if no local authentication on device when setting lockscreen 2022-08-30 14:34:23 +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 708512093e
make method private 2022-08-30 11:36:33 +05:30
Neeraj Gupta 9778c2f42b
undo redundant changes 2022-08-30 10:58:15 +05:30
Neeraj Gupta 22a1f5dde6
Simplify removal of ignoredFiles + documentation 2022-08-30 10:48:34 +05:30
Ashil Kandapath 26ae27baa5 make strings const 2022-08-30 10:44:18 +05:30
Ashil Kandapath e8e89b1bf2 resolved merge conflicts 2022-08-30 10:33:56 +05:30
ashilkn 67597bf627 handled bugs related to when there is no device level authentication 2022-08-30 10:17:17 +05:30
Neeraj Gupta 923795bb58
mark private 2022-08-29 23:49:10 +05:30
Neeraj Gupta 97ed88de3d
remove unused method 2022-08-29 23:35:49 +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
vishnukvmd 83c4ec877f Unapply automated fix 2022-08-29 20:16:44 +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 c62de21916
Fix: Compute hash for files shared to ente 2022-08-29 17:27:43 +05:30
Neeraj Gupta ba221e7d73
Merge branch 'master' into reupload_hash_check 2022-08-29 16:50:05 +05:30
Neeraj Gupta ba82402969
log actual exception 2022-08-29 16:23:09 +05:30
Neeraj Gupta 7432689bb1
Support sending logs on password verification screen 2022-08-29 16:01:25 +05:30
Neeraj Gupta c05cbb87e9
Handle livePhoto hash from web client 2022-08-29 13:35:16 +05:30
Neeraj Gupta 68738c5c56
Refactor fileHash handling 2022-08-29 13:28:49 +05:30
Neeraj Gupta 124672768e
refactor 2022-08-29 10:38:18 +05:30
Neeraj Gupta 28b5e9710f
mark field as final 2022-08-29 10:11:38 +05:30
Neeraj Gupta 7c4efc1b86
remove reundant check on uploadedID 2022-08-29 10:06:00 +05:30
Neeraj Gupta 399cad4561
refactor: rename 2022-08-29 10:00:28 +05:30
Neeraj Gupta 6e75386f5c
remove commented out code 2022-08-29 09:56:29 +05:30
ashilkn 89892ea9f1 enable extra hidden features only for internal testers or on debug build 2022-08-27 15:24:06 +05:30
ashilkn 82b008496a warn user before sharing an album containing hidden files 2022-08-27 13:00:40 +05:30
Neeraj Gupta 3cd3c2dd81
Fix handling of re-upload of deleted file 2022-08-27 12:00:41 +05:30
Neeraj Gupta a4bd0e88c3
Merge branch 'reupload_hash_check' into rewrite_device_sync 2022-08-27 11:53:31 +05:30
Neeraj Gupta d230edc593
Fix bug in matching file on the basis of hash logic 2022-08-27 11:51:06 +05:30
Neeraj Gupta 8ec13b05e9
Fix handling of re-upload of deleted file 2022-08-27 11:16:04 +05:30
ashilkn 5fac3dae60 made a service to get set of collectionIDs of collections with hidden files 2022-08-26 20:14:11 +05:30
ashilkn 66a50ff045 get latest visible file from collection on getLatestVisibleFiles() 2022-08-26 17:57:59 +05:30
ashilkn f6e4659fb6 hid hidden files from albums 2022-08-26 17:44:40 +05:30
Neeraj Gupta 2bbef93713
Fix db update query 2022-08-26 17:17:30 +05:30
Neeraj Gupta 0adcb5bbe0
Handle missing thumbnail 2022-08-26 17:08:13 +05:30
Neeraj Gupta e72ab4f52d
Clear ignoredFiles db while resetting db 2022-08-26 17:07:59 +05:30
Neeraj Gupta 38b719c61e
Fix handling for ignored files 2022-08-26 17:07:31 +05:30
Neeraj Gupta 0fa121878d
Fix bug in matching file on the basis of hash logic 2022-08-26 17:02:01 +05:30
Neeraj Gupta 23c18c0013
Dedupe device folder file result 2022-08-26 16:41:44 +05:30
Neeraj Gupta 7b043fff30
Sync mapping from device albums to files table 2022-08-26 16:30:22 +05:30
Neeraj Gupta 22cdf59f6e
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-08-26 15:04:59 +05:30
Neeraj Gupta 23bd6ff6ba
Merge branch 'reupload_hash_check' into rewrite_device_sync 2022-08-26 15:04:40 +05:30
Neeraj Gupta cdf6d5d334
Merge branch 'master' into reupload_hash_check 2022-08-26 15:04:15 +05:30
Neeraj Gupta 38771a9402
Put search behind remote feature flag 2022-08-26 14:59:49 +05:30
Neeraj Gupta 72043e9f0d
temp 2022-08-26 14:51:44 +05:30
Manav 2b8fc8e3af Tweaks to finalize search for release
1. Change background scrim color for search overlay in dark mode
2. Add apostrophes to holiday names
3. Reduce debounce interval to 100 ms
2022-08-26 14:16:43 +05:30
Neeraj Gupta f4544cb4db
Chore: Logging improvement 2022-08-26 12:35:10 +05:30
Neeraj Gupta 919186a9c9
Fix: only attempt to update files ownedBy user 2022-08-26 12:34:41 +05:30
Neeraj Gupta 5ad1196172
Remove redundant method for uploading editedFiles 2022-08-26 12:04:41 +05:30
Neeraj Gupta 3bcb907f85
Fire LocalPhotosUpdatedEvent on local mapping change 2022-08-26 11:21:40 +05:30
Neeraj Gupta 74d13107da
Merge branch 'rewrite_device_sync' of github.com:ente-io/frame into rewrite_device_sync 2022-08-26 10:26:56 +05:30
Neeraj Gupta f8220ba1f5
Gallery: Fix loading for all photos for deviceFolder 2022-08-26 10:26:19 +05:30
vishnukvmd 4da025a419 Fix typos 2022-08-25 17:11:49 +05:30
vishnukvmd fe09995df0 Log password verification failures 2022-08-25 16:39:49 +05:30
Neeraj Gupta 91122c6a9c
minor refactor 2022-08-25 16:16:33 +05:30
Neeraj Gupta e221b20ad8
Remove redundant devicePathID field from File 2022-08-25 15:12:37 +05:30
vishnukvmd 6290a934b0 Load origin-files only on iOS 2022-08-25 15:10:53 +05:30
vishnukvmd 5c305e25c4 Fix visibility of util method 2022-08-25 15:08:06 +05:30
vishnukvmd 3bfa5991d9 Render origin files in case of GIFs 2022-08-25 15:07:36 +05:30
Neeraj Gupta 6db967bbc1
refactor 2022-08-25 14:53:33 +05:30
Neeraj Gupta b588221ff1
Simplify getDeviceFiles 2022-08-25 14:32:03 +05:30
Neeraj Gupta 11edab5783
remove redundant sorting 2022-08-25 13:49:15 +05:30
Vishnu Mohandas a9a2a2d579
Merge pull request #442 from ente-io/add-more-holidays 2022-08-25 10:50:31 +05:30
Ashil 5df5726cc1
Merge pull request #440 from ente-io/cache_improvements
Clear video cache after 3 days
2022-08-24 21:08:05 +05:30
Manav dcb269d27a Add some more holidays with (usually) fixed dates 2022-08-24 21:03:21 +05:30
ashilkn 59d8beaf31 added valentines day & halloween to Holidays 2022-08-24 19:33:31 +05:30
ashilkn 9655278b84 fixed alignment of search icon and branding widget 2022-08-24 19:03:11 +05:30
ashilkn e4e1d7fa51 fixed 'upgrade' text getting cut off at bottom 2022-08-24 18:56:04 +05:30
vishnukvmd d755143dcd Clear video cache after 3 days 2022-08-24 17:38:52 +05:30
Neeraj Gupta 9bdf2e8ed6
log syncAll timeTaken 2022-08-24 17:00:40 +05:30
ashilkn 7be21dbd68 minor layout changes 2022-08-24 16:46:48 +05:30
Neeraj Gupta c6c955c889
Return unique files while returning unsynced assets 2022-08-24 16:44:10 +05:30
Neeraj Gupta 64efda4284
Avoid unncessory converstion from localID to File 2022-08-24 16:26:44 +05:30
ashilkn 2d726c6f2b decreased vertical padding of outlinedButton as text inside it was getting cut at the bottom 2022-08-24 16:05:48 +05:30
Neeraj Gupta 3db9b64e36
minor refactor 2022-08-24 16:02:41 +05:30
Neeraj Gupta 4865664642
FileDB: Pass conflictAlg as optional param during insert 2022-08-24 16:02:03 +05:30
ashilkn 59c93e1b23 display error banners below ente logo and search icon 2022-08-24 15:54:12 +05:30
Neeraj Gupta 1bae350ec3
create & track collections for devicePath marked for sync 2022-08-24 10:08:16 +05:30
ashilkn df76813c2d fixed search icon visibility issue on different top bar states 2022-08-23 19:19:54 +05:30
Neeraj Gupta a0007ba45a
Fix issue in tracking all folders 2022-08-23 18:49:20 +05:30
Neeraj Gupta 0c07eb4d05
More changes related to backup folder tracking 2022-08-23 18:25:07 +05:30
Neeraj Gupta c5b9068b56
Minor refactor and bug fix 2022-08-23 17:53:17 +05:30
Neeraj Gupta 6521d66c0e
switch to devicePathCollection for tracking folder sync 2022-08-23 17:49:26 +05:30
Neeraj Gupta 2b4f727a0e
Backup folders selection: switch to device pathId instead of name 2022-08-23 17:21:59 +05:30
ashilkn 1b9b5bc511 minor changes 2022-08-23 17:16:05 +05:30
Neeraj Gupta 67ae041fce
Use DevicePathCollection sync attribute for folderSync icon 2022-08-23 17:06:40 +05:30
Neeraj Gupta 0502cd20da
Refactor and honor select all folder sync 2022-08-23 16:45:15 +05:30
ashilkn 99f84da428 added comments and changed debounce duraiton to 200ms 2022-08-23 16:42:44 +05:30