Commit graph

4652 commits

Author SHA1 Message Date
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
Ashil d686e4aba4
Merge pull request #449 from ente-io/hide-files
Hide files
2022-08-30 15:58:58 +05:30
Ashil Kandapath d780752028 minor changes 2022-08-30 13:46:40 +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 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
Manav 38525ba9b5
Merge pull request #453 from ente-io/final
final all the vars!
2022-08-29 20:17:45 +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
Vishnu Mohandas 3b8d8bb4fb
Merge pull request #451 from ente-io/add_exception
Include exception detail in the log
2022-08-29 16:25:04 +05:30
Neeraj Gupta 6d48964a7b
bump version code to 0.6.29+359 2022-08-29 16:23:26 +05:30
Neeraj Gupta ba82402969
log actual exception 2022-08-29 16:23:09 +05:30
Vishnu Mohandas 84724bb87c
Merge pull request #450 from ente-io/incorrect_password_logs
Support for sending logs during sign up
2022-08-29 16:04:00 +05:30
Neeraj Gupta bb0af1c795
bump version code to 0.6.28+358 2022-08-29 16:02:17 +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 27aef4699d Merge branch 'master' into hide-files 2022-08-27 14:10:59 +05:30
ashilkn 82b008496a warn user before sharing an album containing hidden files 2022-08-27 13:00:40 +05:30
Manav 730d656641
Merge pull request #448 from ente-io/bump_version_release
bump version to 0.6.26+356
2022-08-27 12:07:27 +05:30
Neeraj Gupta 35ac76fcd4
bump version to 0.6.26+356 2022-08-27 12:06:36 +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
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 23bd6ff6ba
Merge branch 'reupload_hash_check' into rewrite_device_sync 2022-08-26 15:04:40 +05:30