fix(upload-list): handle conflict actions#16819
Open
alperozturk96 wants to merge 5 commits intomasterfrom
Open
fix(upload-list): handle conflict actions#16819alperozturk96 wants to merge 5 commits intomasterfrom
alperozturk96 wants to merge 5 commits intomasterfrom
Conversation
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
alperozturk96
added
the
ux-enhancement
Collaborator
Author
|
/backport to stable-33.1.0 |
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
alperozturk96
commented
Apr 9, 2026
| <string name="upload_local_storage_full">Local storage full</string> | ||
| <string name="upload_old_android">Encryption is only possible with >= Android 5.0</string> | ||
| <string name="upload_sync_conflict">Sync conflict, please resolve manually</string> | ||
| <string name="upload_sync_conflict_checking">Checking for upload conflicts…</string> |
Collaborator
Author
There was a problem hiding this comment.
@kra-mo Please share your feedback regarding wording :)
4 tasks
This was referenced Apr 9, 2026
4 tasks
|
test-Unit test failed, but no output was generated. Maybe a preliminary stage failed. |
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
|
APK file: https://github.com/nextcloud/android/actions/runs/24192202894/artifacts/6350914432 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Issue
On Android, we are showing conflicts based on the stored last upload result, but this is wrong because the server can change at any moment. As a result, we may display an incorrect status, and the user might try to open the conflict resolution dialog even though it’s unnecessary, perhaps the file no longer exists on the remote server or has been moved.
Flow
First check remote path from
OCUploadviaReadFileOperation-> if file not there remove conflict error and allow user to retry uploadIf file exists on remote and same -> if file not there remove conflict error and allow user to retry upload
If file exists and different -> show conflict resolve dialog
Changes
isSamelogic since its necessary for this PR as well.UploadListAdapterHelper,UploadListAdapterActionsince needed for handling conflicts and not bloating the adapter logic. Also we need to implement other actions as well in future.UploadFileOperationFactorysince huge constructor needs to be repeated for each fileDemo - if conflict exists
Screen_recording_20260409_150419.webm
Demo - if conflict not exists anymore (e.g. file moved or removed from server)
Screen_recording_20260409_150442.webm