Commit graph

1235 commits

Author SHA1 Message Date
Neeraj Gupta 3c5816587c
Minor fix in hidden failure 2022-12-15 09:31:51 +05:30
Neeraj Gupta 1aadc08fdf
Merge branch 'redesign-with-components' into collaboration_view 2022-12-14 15:13:54 +05:30
ashilkn 14da1794ec Minor change 2022-12-14 10:11:30 +05:30
ashilkn fcb7f3e67d Removed repeated query parameter 2022-12-13 17:59:55 +05:30
Neeraj Gupta 9cf457a903
remove feature flag 2022-12-12 12:55:46 +05:30
Neeraj Gupta 8891b0ce58
Merge branch 'master' into collaboration_view 2022-12-11 19:18:23 +05:30
Neeraj Gupta 1506d5115f
Add feature flag for collect 2022-12-11 18:19:42 +05:30
Neeraj Gupta b71c214c58
Merge branch 'master' into collaboration_view 2022-12-08 14:06:00 +05:30
Neeraj Gupta 4e4807ac5a
Show rate us on AlternativeTo 2022-12-07 14:08:57 +05:30
vishnukvmd 7133930af4 Merge branch 'master' into grid 2022-12-06 23:29:03 +05:30
vishnukvmd 3b28725458 Remove duplicate code 2022-12-06 22:28:17 +05:30
Neeraj Gupta 67ef2bfad4
Merge branch 'master' into password_prompt 2022-12-06 14:14:21 +05:30
vishnukvmd 34746a9712 Always fetch user specific plans 2022-12-06 13:58:52 +05:30
Neeraj Gupta a075f335e8
Fix state fresh issues while adding/remove participants 2022-11-25 16:34:35 +05:30
Neeraj Gupta 4143a14ab3
Fix state refresh issue on collab add/remove 2022-11-25 16:02:20 +05:30
Neeraj Gupta 59b9bafb7e
Merge branch 'master' into collaboration_view 2022-11-25 15:35:21 +05:30
Neeraj Gupta 8fba024653
Minor fixes 2022-11-25 10:01:53 +05:30
Neeraj Gupta 94ce181f22
Add password reminder for iOS 2022-11-25 09:38:27 +05:30
Neeraj Gupta 2732b399d4
Add option to free up space for a device folder 2022-11-24 16:24:59 +05:30
Neeraj Gupta 6f386640d2
Merge branch 'master' into collaboration_view 2022-11-24 12:02:47 +05:30
Neeraj Gupta 06296051c1
Fix typo 2022-11-24 10:08:06 +05:30
Neeraj Gupta ac539fa4b5
Fix bug where hasMarkedAllFolder was set incorrectly 2022-11-24 10:06:25 +05:30
Neeraj Gupta 0bf87f4042
Fix bug where hasMarkedAllFolder was set incorrectly 2022-11-24 10:04:03 +05:30
Neeraj Gupta 7cee5e1b70
Merge remote-tracking branch 'origin/master' into bug_fixes 2022-11-23 11:20:23 +05:30
Neeraj Gupta f17d8813a7
Add change log 2022-11-23 09:09:52 +05:30
Neeraj Gupta e5615ac17b
Fix critical bug in syncing folder 2022-11-23 08:58:57 +05:30
Neeraj Gupta 1052b3c034
Show collab collections in add to list 2022-11-23 07:33:04 +05:30
Neeraj Gupta 14dbc28284
Add flag to return collaborative albums 2022-11-23 07:24:43 +05:30
Neeraj Gupta df9d5d5771
Support for adding as collaborator 2022-11-22 23:13:36 +05:30
Neeraj Gupta af45eacd1f
Fix critical bug in syncing folder 2022-11-22 21:04:10 +05:30
Neeraj Gupta 2e53ac6635
Add delay in refreshing 2FA status on appStart 2022-11-22 19:45:38 +05:30
Neeraj Gupta 72e056bc54
Fix: Fetch 2FA status when account is configured 2022-11-22 19:40:56 +05:30
Neeraj Gupta 1e18531c5f
Merge pull request #663 from ente-io/fix_copy
Fix cases
2022-11-21 20:14:58 +05:30
vishnukvmd 8ee5c863d8 Fix cases 2022-11-21 14:59:17 +05:30
ashilkn f8296ca639 minor fix 2022-11-18 14:26:09 +05:30
ashilkn 253614143a define params inside each batch 2022-11-18 12:52:34 +05:30
ashilkn 3fa1875392 Merge branch 'master' into batch-files 2022-11-18 12:08:51 +05:30
ashilkn 36fe2d46d4 use constant variable for batch size 2022-11-18 11:35:46 +05:30
ashilkn 6f30346462 batch files to batch of 1000s on deleteFromTrash() 2022-11-18 10:52:52 +05:30
ashilkn 7607cbf788 batch files to batch of 1000s on removeFromCollection() 2022-11-17 21:34:48 +05:30
ashilkn ce9c44e581 refactor batching on trashFilesOnServer() 2022-11-17 17:33:21 +05:30
ashilkn c6a8d9dcf8 batch files to batch of 1000s on restore() 2022-11-17 17:05:54 +05:30
ashilkn ee95b7effd batch files to batch of 1000s on updateMagicData() 2022-11-17 16:27:22 +05:30
Neeraj Gupta 4eaad13bd8
CollectionDelete: Do not turn-off folder backup if collection is empty 2022-11-17 15:10:13 +05:30
ashilkn 9d7b830c7d batch files to batch of 1000s on addToCollection() 2022-11-17 15:08:35 +05:30
Neeraj Gupta 75fd37718c
Fix: Create on ente album only when files can be uploaded in that album 2022-11-17 14:45:17 +05:30
ashilkn 6c882d233e batch files to batch of 1000s on move() 2022-11-17 14:44:01 +05:30
Neeraj Gupta f063bdbd4d
Favorite: Cache fav fileIds for quick lookup 2022-11-17 11:00:23 +05:30
ashilkn aafaf22bf0 add .ignore for future 2022-11-16 20:03:39 +05:30
ashilkn f0838f5916 added listener to TwoFactorStatusChangeEvent to change two factor status in shared pref when event fires 2022-11-16 18:29:25 +05:30
ashilkn c7d6542219 move two shared pref logic to user service 2022-11-16 17:50:02 +05:30
ashilkn 32640948c5 Merge branch 'master' into 2fa-toggle-bug-fix 2022-11-16 10:03:41 +05:30
Ashil 02a91d32a4
Merge pull request #643 from ente-io/fix_time
[Migration] Fix bad creation time for already imported/uploaded files
2022-11-16 10:02:54 +05:30
ashilkn 2d7d82d556 sync two factor status in shared pref everytime two factor status is fetched from server 2022-11-16 09:37:13 +05:30
ashilkn eea62276a6 Merge branch 'master' into 2fa-toggle-bug-fix 2022-11-15 19:13:04 +05:30
ashilkn 4555f5d79f use completer to fix bug on 2FA status change 2022-11-15 19:12:26 +05:30
Neeraj Gupta 734afbfbb1
Fix state refresh issue on leave album 2022-11-15 15:50:26 +05:30
Neeraj Gupta 2907721604
Fix state refresh bug during delete album 2022-11-15 15:47:01 +05:30
Neeraj Gupta 34de3f5fc3
Merge pull request #583 from ente-io/empty_albums
Empty albums
2022-11-15 10:54:56 +05:30
Vishnu Mohandas 63a6f457df
Merge pull request #642 from ente-io/fix_copy 2022-11-14 17:23:13 +05:30
Neeraj Gupta 75eb89fbf9
Fix minor bug 2022-11-14 16:56:32 +05:30
Neeraj Gupta 40b2c07967
ignore uploaded files with editedTime 2022-11-14 16:30:39 +05:30
Neeraj Gupta 792710a19d
Add migration script for fixing badCreationTime 2022-11-14 15:03:16 +05:30
vishnukvmd 3332b030ef Fix casing in copies 2022-11-14 14:20:41 +05:30
Neeraj Gupta 7ba30c5898
minor refactor 2022-11-14 14:11:42 +05:30
Neeraj Gupta 9f935e11f0
Add support for bulkEdit time 2022-11-14 14:03:49 +05:30
Neeraj Gupta 39cac17c0c
FileMetadata: Support for bulk updating different values 2022-11-14 13:37:32 +05:30
Neeraj Gupta 51d0ee0d20
Add enum: EditTimeSource 2022-11-14 12:46:51 +05:30
Neeraj Gupta 5f3f46eaf8
remove redundant ignore for lint rule 2022-11-14 12:18:15 +05:30
Neeraj Gupta 504bdddd95
Merge pull request #641 from ente-io/more_fixes
Misc. fixes and perf improvements
2022-11-14 11:17:48 +05:30
Neeraj Gupta 3b8ffd3043
Avoid redundant db queries 2022-11-14 10:58:19 +05:30
Neeraj Gupta dbf5e257ea
Perf: Fire event for deleted collection only if previously cached 2022-11-14 10:17:23 +05:30
Neeraj Gupta 4f766c1775
mark unawaited collections as ignored 2022-11-14 10:11:40 +05:30
Neeraj Gupta 871a010961
Merge pull request #640 from ente-io/perf_changes
Perf: Use cached value of collection key
2022-11-13 14:19:05 +05:30
Neeraj Gupta 7b71d107f8
Cache and use cached collection decryptionKey 2022-11-13 14:00:30 +05:30
Neeraj Gupta 75f77f279e
Add EnteWatch for easy logging of time taken 2022-11-13 14:00:30 +05:30
Vishnu Mohandas e8a7803da2
Merge pull request #639 from ente-io/fix_2fa_reset
Allow resetting on 2FA with the mnemonic phrase
2022-11-13 13:57:09 +05:30
vishnukvmd fd581d553f Allow resetting of 2FA with the mnemonic phrase 2022-11-13 13:52:43 +05:30
Neeraj Gupta 992a2c30ab
Remove redundant forceReload of home gallery 2022-11-12 16:41:16 +05:30
Neeraj Gupta 9f72614ed2
Logging improvements: 2/n 2022-11-11 18:39:22 +05:30
Neeraj Gupta 9faeb511db
Log source for all CollectionUpdate events 2022-11-11 17:00:37 +05:30
Neeraj Gupta 4cc2f70710
Enchance logs for easier debugging 2022-11-11 15:53:35 +05:30
Neeraj Gupta 198ad9880d
Show update changelog for independent apk 2022-11-10 00:26:26 +05:30
Neeraj Gupta aa1cfd211f
Do not show change log on independent apk 2022-11-09 15:16:44 +05:30
Neeraj Gupta a74137103f
Track if changeLog needs to be shown or not 2022-11-09 13:48:58 +05:30
Neeraj Gupta afe10c0adc
Fix null pointer exception sentry#5606 2022-11-09 11:32:34 +05:30
Neeraj Gupta 4a060c4edd
Fix unawaited future warnings 2022-11-06 16:06:33 +05:30
Neeraj Gupta 943c5edfb6
Add lint rule to warn for unawaited futures 2022-11-06 15:46:14 +05:30
Neeraj Gupta 46fe951e0d
Merge pull request #621 from ente-io/removeAwaits
Remove unncessary Future/Awaits
2022-11-06 15:08:45 +05:30
Neeraj Gupta bbbc61fd4e
Merge branch 'master' into empty_albums 2022-11-06 14:45:46 +05:30
Neeraj Gupta 19cc54f422
Fix lint issues 2022-11-06 13:52:54 +05:30
Neeraj Gupta b6688d4646
minor fix 2022-11-06 11:54:10 +05:30
Neeraj Gupta 709e2a0085
Remove unncessary awaits by passing pref 2022-11-06 11:44:46 +05:30
Neeraj Gupta 01121ddc62
Billing: Remove redundant future 2022-11-06 11:38:24 +05:30
Neeraj Gupta ec8aab680d
Add support for searching by caption 2022-11-05 11:22:28 +05:30
Neeraj Gupta 9a468c97c7
remove redundant null comparision 2022-11-02 16:18:11 +05:30
Neeraj Gupta 66e7fc0560
Add unhide option in overflow menu 2022-11-02 15:55:32 +05:30
Neeraj Gupta f7d43d33ee
Handle case when file is already part of hidden collection 2022-11-02 15:27:40 +05:30
Neeraj Gupta e91d2de311
Update cache immedidately 2022-10-31 16:24:30 +05:30
Neeraj Gupta 858f0b5720
Remove hidden collection items from search result 2022-10-31 16:14:20 +05:30
Neeraj Gupta 8ccb4476a6
Search: Do not load files in memory unless needed 2022-10-31 16:06:56 +05:30
Neeraj Gupta 8d02908308
Exclude hidden albums from search 2022-10-31 15:44:21 +05:30
Neeraj Gupta 5744c35874
Fix bug in collection creation 2022-10-31 15:42:04 +05:30
Neeraj Gupta 830d8c3d8e
Changes for Hidden 2022-10-31 15:26:59 +05:30
Neeraj Gupta 587c0b5cd9
Support for basic hidden functionality 2022-10-27 12:53:45 +05:30
Neeraj Gupta c479a8e225
Support for hidden stuff 2022-10-27 11:35:39 +05:30
Neeraj Gupta 5932bcb3cd
Hide hidden collections from timeline and memory 2022-10-26 22:41:06 +05:30
Neeraj Gupta cb246cc436
Merge branch 'master' into main_galley_all 2022-10-20 15:36:38 +05:30
Neeraj Gupta 635bc0bed0
Remove device folder name from logs 2022-10-20 14:56:56 +05:30
Neeraj Gupta 5fae039823
Refactor home widget 2022-10-20 14:40:17 +05:30
Neeraj Gupta d80868b053
Show empty and archived albums in search result 2022-10-19 17:26:06 +05:30
Neeraj Gupta b7bcef98d9
Refactor 2022-10-19 17:09:56 +05:30
Neeraj Gupta 5df97c4f19
RemoteSync: Force reload gallery on file update 2022-10-18 00:15:11 +05:30
Neeraj Gupta 9d4765a48d
Invalidate cache on local hash mismatch 2022-10-18 00:12:48 +05:30
Neeraj Gupta 1fd2efd9c7
Switch to enteDio 2022-10-14 20:33:55 +05:30
Neeraj Gupta aadc34d4e1
Switch to enteDio 2022-10-14 15:33:58 +05:30
Neeraj Gupta 02e1c70d2e
Use enteDio in UserService 2022-10-14 15:02:51 +05:30
Neeraj Gupta d4856e3ed4
Remove unused model 2022-10-14 14:15:17 +05:30
Neeraj Gupta 217b42925e
Merge pull request #560 from ente-io/leave_album
Support for leaving shared album
2022-10-11 11:22:04 +05:30
Neeraj Gupta 651ccfd7e6
Support for leaving shared album 2022-10-11 07:05:09 +05:30
vishnukvmd 1159b8e6f3 Upgrade in_app_purchase 2022-10-10 22:40:57 +05:30
Neeraj Gupta ddf8b6438e
LocalSync: Handle empty album 2022-10-07 03:29:35 +05:30
Neeraj Gupta 0d5b6803f5
Handle npe due to missing asset 2022-10-03 16:16:46 +05:30
Neeraj Gupta a1fddd23ee
Merge branch 'master' into update_index 2022-10-03 15:01:02 +05:30
Neeraj Gupta cf28c69058
Use milliSec instead of microSec while calling photo manager 2022-10-03 14:08:00 +05:30
Neeraj Gupta 4f6d64f7a2
[FileUpdate]Limit number of files processed in a singleRun 2022-10-03 11:15:23 +05:30
Neeraj Gupta 90d1ce2271
[iOS] Skip re-upload check on mismatch of local and remote modTime 2022-10-03 11:07:18 +05:30
Neeraj Gupta 292b700208
remove re-upload for missing location logic 2022-10-03 10:16:01 +05:30
Neeraj Gupta 327ea4e595
Search: Do not getAllFiles from DB on localPhoto update event 2022-10-02 23:43:25 +05:30
vishnukvmd 996996e151 Ignore Recent on Android 2022-09-29 16:29:19 +05:30
Neeraj Gupta d71dc7463e
Fix: Show newly queued up files for upload on UI 2022-09-29 15:41:55 +05:30
Neeraj Gupta a2603a7dd9
Show progress dialog on folder selection update 2022-09-29 14:19:50 +05:30
Neeraj Gupta f2244f8ae2
Show import progress on loading screen 2022-09-27 09:39:36 +05:30
Neeraj Gupta f4e05db855
Merge branch 'rewrite_device_sync' of github.com:ente-io/frame 2022-09-26 17:47:31 +05:30
Ashil 0803130e5f
Merge pull request #530 from ente-io/video-loader
Video loader
2022-09-26 14:24:10 +05:30
Neeraj Gupta 40e96f1cec
Merge branch 'ente_theme' into rewrite_device_sync 2022-09-26 14:07:16 +05:30
Neeraj Gupta ef924f1545
improve local photo visiblity on import 2022-09-26 14:04:37 +05:30
ashilkn 0e3d6afc76 video loader bug fix for files in which diff is not fetched yet 2022-09-26 13:08:08 +05:30
Neeraj Gupta e7261c6eec
Fix mapping of edited files on Android 2022-09-23 19:42:31 +05:30
ashilkn 5ff88756af renamed kBooleanFeatureFlagsKey to _featureFlagsKey 2022-09-23 16:28:58 +05:30
Neeraj Gupta f8204ca65d
re-scan files for upload after initial upload 2022-09-23 16:02:57 +05:30
ashilkn de0988ff51 remove prefix letter 'k' from constant 2022-09-23 13:54:21 +05:30
ashilkn 5e4db4b2a0 migrated feature_flag_service.dart to null safety 2022-09-23 13:53:22 +05:30
ashilkn 0d7e44c7f5 removed unused code 2022-09-23 13:42:14 +05:30
ashilkn f3213cc848 convert to getters 2022-09-23 07:18:25 +05:30
ashilkn 61a5553d36 migrated constants.dart to null safety 2022-09-22 10:56:14 +05:30
Ashil 19123c1957
Merge pull request #518 from ente-io/migrate-to-null-safety
Migrate to null safety
2022-09-22 10:41:21 +05:30
Neeraj Gupta 74c26628d6
Fix: Show backup folder option during onboarding 2022-09-21 20:21:14 +05:30
ashilkn 8d7758a70f Merge branch 'rewrite_device_sync' into migrate-to-null-safety 2022-09-21 18:11:41 +05:30
Neeraj Gupta 99a5bd8ff0
Merge branch 'rewrite_device_sync' of github.com:ente-io/frame into rewrite_device_sync 2022-09-21 17:57:39 +05:30
Neeraj Gupta 0a6d6f0f62
Merge branch 'master' into rewrite_device_sync 2022-09-21 17:57:09 +05:30
ashilkn 3041351d03 migrated app_lifecycle_service.dart to null safety 2022-09-21 17:50:59 +05:30
Neeraj Gupta de9d6e7541
RecoveryKeyVerification: remove notification is verified on different device 2022-09-21 15:48:42 +05:30
ashilkn 51eb2cceff Merge branch 'migrate-to-null-safety' into migrate-to-null-safety-2 2022-09-21 10:58:47 +05:30
ashilkn 5d69149ae6 Merge branch 'migrate-to-null-safety' of https://github.com/ente-io/frame into migrate-to-null-safety 2022-09-21 10:56:21 +05:30
ashilkn d4c226d10a migrated notification_service.dart to null safety 2022-09-21 09:52:43 +05:30
Neeraj Gupta 5920abe112
use firstWhereOrNull 2022-09-20 23:31:21 +05:30
Neeraj Gupta e6bc277fa3
Merge branch 'rewrite_device_sync' of github.com:ente-io/frame into rewrite_device_sync 2022-09-20 23:25:14 +05:30
Neeraj Gupta 8734c94a4e
Merge branch 'master' into rewrite_device_sync 2022-09-20 23:24:47 +05:30
ashilkn c9bbb80c05 remove prefix letter 'k' from constants in constants.dart 2022-09-20 17:23:32 +05:30
Neeraj Gupta 113d77a456
fix delay 2022-09-20 16:49:03 +05:30
Neeraj Gupta aed002157c
minor bug fixes 2022-09-20 16:03:22 +05:30
Neeraj Gupta 6bab218942
refactor 2022-09-20 11:55:22 +05:30
Neeraj Gupta ca940e9c64
Add UserRemoteFlag service 2022-09-20 11:35:34 +05:30
ashilkn 3e8bfc6f29 remove prefix letter 'k' from constants 2022-09-19 17:22:20 +05:30
Neeraj Gupta 144e86dcbf
Add UserRemoteFlag service 2022-09-19 15:46:52 +05:30
Neeraj Gupta c4eb36188c
bug fix 2022-09-16 21:20:00 +05:30
Neeraj Gupta 5059a4f102
remove debugLogs 2022-09-16 17:45:10 +05:30
Neeraj Gupta f7ed0a3db6
Search: Support for search by calendar date & specific day 2022-09-16 17:41:16 +05:30
ashilkn 624397c6f0 replace regex check with checking after converting to lower case on search 2022-09-16 11:43:24 +05:30
Neeraj Gupta c70f6babcc
FixBug: ensure getOrCreateForPath does not return deleted collection 2022-09-15 13:12:14 +05:30
Neeraj Gupta b52ea8f302
remove unused method: getCollectionForPath 2022-09-15 12:55:46 +05:30
Neeraj Gupta 2ef7c7ce01
CollectionService: remove getCollectionNameByID method
Signed-off-by: Neeraj Gupta <254676+ua741@users.noreply.github.com>
2022-09-15 12:41:57 +05:30
Neeraj Gupta 5f5caeb887
Remove disableUrl sharing feature flag 2022-09-15 11:04:22 +05:30
Neeraj Gupta c4846a55a5
remove enableSearch feature flag 2022-09-15 10:54:04 +05:30
Neeraj Gupta c730e36201
Search: Support for searching by fileExtension 2022-09-15 10:14:09 +05:30
Neeraj Gupta db37c8b6dd
Support for searching by type:Image/Video/LivePhoto 2022-09-15 09:59:46 +05:30
Neeraj Gupta 0080d82d22
Fix typo 2022-09-14 16:27:47 +05:30
Neeraj Gupta bffc967e21
more refactoring 2022-09-14 16:25:45 +05:30
Neeraj Gupta 40ddbc968f
SearchService: mark method getAllFiles as private 2022-09-14 14:03:51 +05:30
Neeraj Gupta 819a8ad6d3
Debug: Add option to clear ignored files 2022-09-13 14:03:37 +05:30
Neeraj Gupta a7766d3b30
Merge branch 'master' into rewrite_device_sync 2022-09-13 13:16:35 +05:30
Neeraj Gupta 75e0341606
Fix: fire syncTrash after emptying trash 2022-09-13 12:49:13 +05:30
Neeraj Gupta 06e619e9b3
Add support for trashing collections 2022-09-13 12:14:10 +05:30
Neeraj Gupta 8b2a8554db
minor refactor 2022-09-13 09:14:48 +05:30
Neeraj Gupta ff5117f55f
Merge pull request #474 from ente-io/part_5_local_file_speed
Part 5: Fix minor issues for while showing local files
2022-09-12 21:35:16 +05:30
Neeraj Gupta f7723b2bc5
migrate only after first import is done 2022-09-12 17:49:05 +05:30
Neeraj Gupta ca282c4979
Fix: Refresh device folder state on PhotoManager callback 2022-09-12 17:34:19 +05:30
Neeraj Gupta df6f6c7d60
set collectionID as null instead of -1 2022-09-12 14:59:01 +05:30
Ashil 67d318d6b5
Merge pull request #469 from ente-io/incremental-migration-to-null-safety
Migrate all search models to null safety
2022-09-12 12:35:48 +05:30
Neeraj Gupta 178e68a3da
minor refactor 2022-09-12 11:49:17 +05:30
Neeraj Gupta 6b22064590
Fix logic to show backupfolder hook 2022-09-12 11:45:22 +05:30
Neeraj Gupta 64363dcac4
Fire TrashUpdatedEvent and refresh trashCount based on that 2022-09-12 10:29:13 +05:30
Neeraj Gupta b44c349c10
Add missing await and use unawaited for remote sync 2022-09-12 10:12:53 +05:30
Neeraj Gupta 7ba4ccb16b
add log when syncing remote is resulting in forceReload of gallery 2022-09-12 10:07:18 +05:30
Neeraj Gupta d61d456217
[Part-4] Mark all folders for backup when limited permission is granted 2022-09-10 10:06:41 +05:30
ashilkn b9bd97446e Merge branch 'rewrite_device_sync_remote' of https://github.com/ente-io/frame into incremental-migration-to-null-safety 2022-09-09 17:58:37 +05:30
Neeraj Gupta e14f44e6bd
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-09 17:51:23 +05:30
Neeraj Gupta 6aa01ce833
minor refactor 2022-09-09 17:50:37 +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 53ce251528
remove unused variable 2022-09-09 16:01:29 +05:30
Neeraj Gupta 01c29037dd
Handle cancellation for uploads when folder is unmarked for backup 2022-09-09 15:04:09 +05:30
ashilkn 78392da517 resolved merge conflicts 2022-09-09 12:56:59 +05:30
Neeraj Gupta 5851e48fe1
minor refactor 2022-09-08 11:24:07 +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
Ashil 9c0226e549
Merge pull request #467 from ente-io/migrate-to-null-safety
started incremental migration to null safety
2022-09-07 18:12:31 +05:30
ashilkn c1722959e7 resolve merge conflicts 2022-09-07 17:56:24 +05:30
Neeraj Gupta c99fe1bf59
Merge branch 'master' into rewrite_device_sync_remote 2022-09-07 17:31:00 +05:30
Neeraj Gupta 28dda0443b
Merge branch 'master' into rewrite_device_sync 2022-09-07 17:30:39 +05:30
Neeraj Gupta bb038e043b
Fix stupid bug: continue instead of break 2022-09-07 17:01:11 +05:30
Neeraj Gupta a5b516b643
Migrate existing backup folder selection 2022-09-07 16:20:02 +05:30
Neeraj Gupta cc0c6e3442
Import files from recent collection (isAll True) in the end 2022-09-07 16:01:18 +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 f7d90f2b08
refresh ui on device folder change 2022-09-07 13:45: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
Neeraj Gupta e9e57a6f75
Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote 2022-09-06 23:11:04 +05:30
Neeraj Gupta 9e78775167
Fire event on backup folder updation 2022-09-06 23:09:05 +05:30
Neeraj Gupta 00cbc2e60c
Remove unsued device_folder and rename file 2022-09-06 22:19:02 +05:30
Neeraj Gupta f61ee05fbf
Merge branch 'master' into rewrite_device_sync 2022-09-06 22:14:25 +05:30
Vishnu Mohandas 49802befa0
Merge pull request #454 from ente-io/handle-cases-for-no-password-on-device 2022-09-06 17:50:39 +05:30
Neeraj Gupta 1612b4f8f6
Show error if user tries to link existing subscription to another account 2022-09-06 17:02:22 +05:30
ashilkn 9637a5df49 Merge branch 'master' into handle-cases-for-no-password-on-device 2022-09-06 14:08:14 +05:30
ashilkn 4bf751ea28 refactoring + variable name changes 2022-09-06 14:05:34 +05:30
Neeraj Gupta d9217dee41
Fix typo 2022-09-05 23:00:53 +05:30
ashilkn 1b06395e9c create service file for local authentication 2022-09-05 16:02:04 +05:30
ashilkn 80557f0adf Merge branch 'master' into handle-cases-for-no-password-on-device 2022-09-05 15:25:34 +05:30
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
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 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 536d8b0440
Rewrite storeDiff logic to fix matching bugs 2022-09-04 17:12:22 +05:30
ashilkn 145b998294 sort clubbed dedepue files in alphabetical order of collection names 2022-09-03 20:01:46 +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 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 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 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 a5a135a611
minor rename refactoring 2022-09-01 01:34:02 +05:30
Neeraj Gupta 718fcdf6cb
Rename device_collection.sync -> should_backup 2022-09-01 00:21:17 +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 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
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
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 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
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 399cad4561
refactor: rename 2022-08-29 10:00:28 +05:30
ashilkn 89892ea9f1 enable extra hidden features only for internal testers or on debug build 2022-08-27 15:24:06 +05:30
Neeraj Gupta 3cd3c2dd81
Fix handling of re-upload of deleted file 2022-08-27 12:00:41 +05:30
Neeraj Gupta 8ec13b05e9
Fix handling of re-upload of deleted file 2022-08-27 11:16:04 +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 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
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
vishnukvmd 4da025a419 Fix typos 2022-08-25 17:11:49 +05:30
Neeraj Gupta e221b20ad8
Remove redundant devicePathID field from File 2022-08-25 15:12:37 +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
Neeraj Gupta 9bdf2e8ed6
log syncAll timeTaken 2022-08-24 17:00:40 +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
Neeraj Gupta 3db9b64e36
minor refactor 2022-08-24 16:02:41 +05:30
Neeraj Gupta 1bae350ec3
create & track collections for devicePath marked for sync 2022-08-24 10:08:16 +05:30
Neeraj Gupta 0502cd20da
Refactor and honor select all folder sync 2022-08-23 16:45:15 +05:30