Skip to content

fix(auto upload): file skip check #16276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
alperozturk96 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(auto upload): file skip check #16276

alperozturk96 wants to merge 2 commits into from
+33 −25

Conversation

@alperozturk96
Copy link
Collaborator

@alperozturk96 alperozturk96 commented Jan 12, 2026 •
edited
Loading

  • Tests written, or not not needed

Issue

lastScanTimestampMs != -1L && lastModified < lastScanTimestampMs

This skip logic must be applied for only fileSentForUpload is true, otherwise it will skip newly added files as well.

How to test?

  1. Create a folder that has images from local file manager
  2. Configure that folder for auto-upload
  3. Auto upload will upload all images in it
  4. Add new images from local file manager
  5. Wait for next auto-upload attempt

Result

Screenshot 2026-01-12 at 12 27 33 Screenshot 2026-01-12 at 12 26 57

@alperozturk96
Copy link
Collaborator Author

alperozturk96 commented Jan 12, 2026

/backport to stable-3.35

@alperozturk96
update tests
d59829a 
Signed-off-by: alperozturk <[email protected]>
alperozturk96
alperozturk96 commented Jan 12, 2026
View reviewed changes
app/src/main/java/com/nextcloud/client/jobs/autoUpload/FileSystemRepository.kt
return
}

val entity = dao.getFileByPathAndFolder(localPath, syncedFolder.id.toString())
Copy link
Collaborator Author

@alperozturk96 alperozturk96 Jan 12, 2026

Choose a reason for hiding this comment

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

getAutoUploadFilesEntities already returns file needs to be uploaded and if we skip when fileSentForUpload is true, changed files will not be uploaded.

@github-actions
Copy link

github-actions bot commented Jan 12, 2026

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/16276.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@github-actions
Copy link

github-actions bot commented Jan 12, 2026

Codacy

SpotBugs

CategoryBaseNew
Bad practice4343
Correctness7474
Dodgy code257257
Experimental11
Internationalization77
Malicious code vulnerability33
Multithreaded correctness3434
Performance4444
Security1818
Total481481

@github-actions
Copy link

github-actions bot commented Jan 12, 2026

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

@alperozturk96 alperozturk96 changed the title fix: auto upload file skip check fix(auto upload): file skip check Jan 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ZetaTom ZetaTom Awaiting requested review from ZetaTom

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

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

Assignees

No one assigned

Labels

3. to review backport-request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@alperozturk96