fix: choose correct upload ids for retry #15872
Merged
+123
−119
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
force-pushed
the
fix/choose-correct-upload-ids-for-retry
branch
from
6fbdc17 to
36233d8
Compare
app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
Outdated
Show resolved
Hide resolved
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
alperozturk96
force-pushed
the
fix/choose-correct-upload-ids-for-retry
branch
from
36233d8 to
71209dd
Compare
alperozturk96
force-pushed
the
fix/choose-correct-upload-ids-for-retry
branch
2 times, most recently
from
29890e6 to
dce5c99
Compare
tobiasKaminsky
approved these changes
Nov 14, 2025
Signed-off-by: alperozturk <[email protected]> # Conflicts: # app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
tobiasKaminsky
force-pushed
the
fix/choose-correct-upload-ids-for-retry
branch
from
dce5c99 to
e9dc260
Compare
|
test-Unit test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/15872-Unit-test-09-04 |
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/15872.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.
Changes
Upload conditions are validated before scheduling jobs, ensuring that only eligible uploads are sent to the worker.
Fixes an unnecessary chained call in
UploadListActivityand refreshes the UI after worker completed.Removes
startAutoUploadImmediatelyfromUploadListActivity, as auto uploads are already managed by a periodic job. Manually triggering them provides no benefit, if a previous scan was recently completed, it will simply be skipped.Additionally,
retryFailedUploadsalready handles retrying failed auto uploads.Handles result of
retryFailedUploadsinUploadListActivity.Demo