fix: handle ask user name collision policy#15920
Merged
alperozturk96 merged 10 commits intoNov 26, 2025
Merged
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
alperozturk96
force-pushed
the
fix/handle-ask-user-name-collision-policy
branch
2 times, most recently
from
48d5e3f to
b7ec9c7
Compare
alperozturk96
force-pushed
the
fix/handle-ask-user-name-collision-policy
branch
2 times, most recently
from
c49d81a to
ed703d3
Compare
alperozturk96
force-pushed
the
fix/handle-ask-user-name-collision-policy
branch
from
ed703d3 to
c76f6a0
Compare
This was referenced Nov 17, 2025
alperozturk96
force-pushed
the
fix/handle-ask-user-name-collision-policy
branch
from
c76f6a0 to
cc2f919
Compare
4 tasks
tobiasKaminsky
approved these changes
Nov 26, 2025
Signed-off-by: alperozturk <[email protected]> # Conflicts: # app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt
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]>
alperozturk96
force-pushed
the
fix/handle-ask-user-name-collision-policy
branch
from
cc2f919 to
ff815e3
Compare
Signed-off-by: alperozturk <[email protected]>
CodacySpotBugsSpotBugs increased! |
Signed-off-by: alperozturk <[email protected]>
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/15920.apk |
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
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
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.
Currently,
FileUploadWorkerhandles theNameCollisionPolicy.ASK_USERthis PR brings the same functionality for theAutoUpload.