fix(upload-db) duplicated entries#16618
Merged
alperozturk96 merged 6 commits intomasterfrom Mar 12, 2026
Merged
Conversation
Collaborator
Author
|
/backport to stable-3.36 |
alperozturk96
commented
Mar 3, 2026
| ) | ||
|
|
||
| val capability = CapabilityUtils.getCapability(context) | ||
| result = AutoRename.rename(result, capability) |
Collaborator
Author
There was a problem hiding this comment.
Activate auto-rename if exists before auto-upload because after this call DB insertions will start
alperozturk96
force-pushed
the
fix/upload-entity-duplication
branch
from
e80c56e to
39d4038
Compare
alperozturk96
commented
Mar 12, 2026
app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
Outdated
Show resolved
Hide resolved
Signed-off-by: alperozturk96 <alper_ozturk@proton.me> # Conflicts: # app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt # app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
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-entity-duplication
branch
from
3692402 to
3704807
Compare
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/16618.apk |
|
test-Unit test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16618-Unit-test-10-29 |
|
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
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.
No description provided.