Fix resource leaks and improve file upload collision handling #16235
+79
−36
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Fix Cursor resource leaks in UploadsStorageManager and FileDetailSharingFragment by adding proper try-finally blocks to ensure cursors are always closed - Improve file upload collision handling in UploadFileOperation - Add content comparison for non-encrypted files when SKIP policy is used - Report SYNC_CONFLICT when file with same name has different content - Preserve old behavior for encrypted files and edge cases - Change log level from warning to info for informational messages in AutoUploadWorker and UploadErrorNotificationManager Signed-off-by: dmiales <dmiales@gmail.com>
dmiales
force-pushed
the
fix/cursor-resource-leaks
branch
from
a873683 to
be16396
Compare
alperozturk96
requested changes
Jan 13, 2026
Collaborator
alperozturk96
left a comment
alperozturk96
left a comment
There was a problem hiding this comment.
Hello
Thank you for the PR and for the work you’ve put into it.
Since this change touches multiple areas, including some critical components, we’d like to review and test it carefully. To help make the review process smoother and more focused, could you please consider splitting this PR into smaller, separate ones?
For example
UploadsStorageManager.java → cursor logic changes
UploadFileOperation.java → name-collision policy changes only
FileDetailSharingFragment.java → separate PR
This will help us review each change in isolation and ensure nothing is overlooked.
Thanks again for your contribution.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix resource leaks and improve file upload collision handling
Fix Cursor resource leaks in UploadsStorageManager and FileDetailSharingFragment
by adding proper try-finally blocks to ensure cursors are always closed
Improve file upload collision handling in UploadFileOperation
Change log level from warning to info for informational messages
in AutoUploadWorker and UploadErrorNotificationManager