fix(auto-upload): sync conflict handling #16336
Merged
+72
−84
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
Collaborator
Author
|
/backport to stable-3.35 |
alperozturk96
force-pushed
the
fix/upload-sync-conflict-handling
branch
from
e7acf86 to
74479e6
Compare
alperozturk96
force-pushed
the
fix/upload-sync-conflict-handling
branch
from
0453b59 to
134cd4a
Compare
alperozturk96
commented
Jan 22, 2026
| return null; | ||
| } | ||
|
|
||
| public void handleLocalBehaviour() { |
Collaborator
Author
There was a problem hiding this comment.
private handleLocalBehaviour already used internally no need to call this outside from the UploadFileOperation.
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
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
force-pushed
the
fix/upload-sync-conflict-handling
branch
from
9886842 to
ff1f785
Compare
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
ZetaTom
reviewed
Jan 22, 2026
app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt
Show resolved
Hide resolved
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/16336.apk |
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.
Uh oh!
There was an error while loading. Please reload this page.