BugFix - Offline Operation Conflict Handling #15027
Open
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
alperozturk96
added
the
performance 🚀
alperozturk96
commented
Jun 18, 2025
| @@ -57,32 +56,6 @@ class FileUploaderIntents(private val context: Context) { | |||
| ) | |||
| } | |||
|
|
|||
| fun resultIntent(resultCode: ResultCode, operation: UploadFileOperation): PendingIntent { | |||
There was a problem hiding this comment.
Unused function
alperozturk96
force-pushed
the
bugfix/offline-operation-conflict-handling
branch
2 times, most recently
from
542a8b0 to
7637906
Compare
alperozturk96
commented
Jun 24, 2025
alperozturk96
force-pushed
the
bugfix/offline-operation-conflict-handling
branch
from
20698bd to
5d98ad4
Compare
…tion if delete op successfully completed, change text delete offline folder to delete file or delete folder Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Co-authored-by: kramo <[email protected]> Signed-off-by: Alper Öztürk <[email protected]>
alperozturk96
force-pushed
the
bugfix/offline-operation-conflict-handling
branch
from
2b6134b to
666c051
Compare
Signed-off-by: alperozturk <[email protected]>
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/15027.apk |
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR improves the handling of file and folder conflicts during offline operations.
Changes:
Removed the HashMap previously used in
RefreshFolderOperationandOfflineOperationActionReceiver.Conflict detection is now handled directly by
OfflineOperationWorker.Conflict detection logic checks if the target path already exists on the server. If it does, a conflict is assumed.
Handling Conflicts
Since offline operations do not have access to server-side metadata such as eTags, we cannot reliably compare local and remote versions of a file or folder. To prevent unintended overwrites: If the remote path exists, we treat it as a conflict.
Handling Create File & Create Folder
Users are prompted with a
ConflictResolveDialogto choose how to proceed.Handling Remove & Rename
User interaction is not allowed via
ConflictResolveDialog:These operations lack meaningful resolution options like "Keep Local."
For example, if a user modified a folder on the server and another offline operation attempted to delete the same folder, prompting the user to "keep local" would result in deleting the modified folder, which is not intuitive.
Supporting (Delete Folder, Delete File, Rename Folder, Rename File -- which files in the folder can be deleted which ones not etc.) these operations in the
ConflictResolveDialogwould introduce unnecessary complexity.Instead:
Users are notified of the conflict via a notification.
The corresponding offline operation is removed from the database.
If the user still intends to rename or delete the file/folder, they can manually retry the operation.