Skip to content

handle(auto-upload): LOCKED#16988

Open
alperozturk96 wants to merge 6 commits intomasterfrom
handle/423-locked
Open

handle(auto-upload): LOCKED#16988
alperozturk96 wants to merge 6 commits intomasterfrom
handle/423-locked

Conversation

@alperozturk96
Copy link
Copy Markdown
Collaborator

@alperozturk96 alperozturk96 commented May 4, 2026

Issue

Server may be busy with previous upload attempt thus next-attempt will throw LOCKED 423 and user will see wrong information about this such as Upload failed however this can be recovered and can be temporary error.

Changes

  • Show correct message instead of error
  • Handle LOCKED status and add delay for next upload attempt
  • Only show one LOCKED error messages thus this can be same issue for the next upload attempts
  • Fixes clear action for SKIPPED uploads

@alperozturk96
handle(auto-upload): LOCKED
688fdea 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add random delay
2efe0d7 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
fix skipped uploads clear function
211ec3d 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
Copy link
Copy Markdown
Collaborator Author

alperozturk96 commented May 4, 2026

/backport to stable-33.1.x

@alperozturk96 alperozturk96 requested a review from kra-mo May 4, 2026 09:21
@alperozturk96
fix codacy
36aa6e4 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 4, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25311272969/artifacts/6780452937
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

alperozturk96
alperozturk96 commented May 4, 2026
View reviewed changes
Comment thread app/src/main/java/com/nextcloud/client/jobs/upload/UploadRetryPolicy.kt Outdated
kra-mo
kra-mo previously requested changes May 4, 2026
View reviewed changes
Comment thread app/src/main/res/values/strings.xml Outdated
@alperozturk96 @kra-mo
Update app/src/main/res/values/strings.xml
4bbf161 
Co-authored-by: Laura Kramolis <git@kramo.page>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 4, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25322421147/artifacts/6784961124
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96
adjust timing
bcc46f7 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96 alperozturk96 requested a review from kra-mo May 5, 2026 06:22
@alperozturk96 alperozturk96 dismissed kra-mo’s stale review May 5, 2026 06:22

pr is updated

alperozturk96
alperozturk96 commented May 5, 2026
View reviewed changes
Comment thread app/src/main/java/com/nextcloud/client/jobs/upload/UploadDelayPolicy.kt
}

fun increase() {
if (delayInMs >= MAX_DELAY) {
Copy link
Copy Markdown
Collaborator Author

@alperozturk96 alperozturk96 May 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lock should only take a couple of seconds, maximum.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25361163421/artifacts/6800009760
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

Codacy

SpotBugs

CategoryBaseNew
Bad practice3535
Correctness6767
Dodgy code216216
Experimental11
Internationalization77
Malicious code vulnerability22
Multithreaded correctness3434
Performance4242
Security1616
Total420420

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

@kra-mo kra-mo Awaiting requested review from kra-mo

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

3. to review backport-request feature: auto upload

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@alperozturk96 @kra-mo