Skip to content

fix(receivers): upload #16317

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
Merged
alperozturk96 merged 11 commits into from
Jan 29, 2026
Merged

fix(receivers): upload #16317

alperozturk96 merged 11 commits into from
Jan 29, 2026
+184 −226

Conversation

@alperozturk96
Copy link
Collaborator

@alperozturk96 alperozturk96 commented Jan 19, 2026 •
edited
Loading

  • Tests written, or not not needed

Issue

After migrating file uploads from a foreground service to worker, the previous mechanism for notifying activities such as UploadListActivity and FileDisplayActivity via LocalBroadcastManager stopped functioning correctly.

Specifically:

Once an upload completes, the adapters (OCFileListAdapter, UploadListAdapter) are not refreshed with the updated data.
Upload start and completion events were not correctly triggered in UploadListActivity and FileDisplayActivity, preventing proper UI updates.

Changes

Ensured worker state is correctly updated in finally blocks to maintain consistency.
The adapter is now notified correctly when the FileUploadWorker finishes.
Restored previously working LocalBroadcastManager logic for notifying activities.
Removed FileUploadStarted and FileUploadCompleted worker states, as broadcasts are now used.
Broadcast receivers are registered in onStart and unregistered in onStop for proper lifecycle handling.
Added clear documentation to functions describing their purpose and expected triggers.
Adds file upload completion event for AutoUploadWorker.

Test

  1. When a user manually uploads a file or files or uploads files via AutoUploadWorker, FileDisplayActivity, UploadListActivity must display an updated list after the file or files upload completion. The adapter must not be triggered excessively; it must be triggered only batch by batch.

Impact

With this change, users can see updates in real time in the file list and upload list tabs.

@alperozturk96 alperozturk96 mentioned this pull request Jan 19, 2026
Closed
1 task
@alperozturk96 alperozturk96 added the ux-enhancement Improvements that refine user interactions, accessibility, or overall usability label Jan 19, 2026
@alperozturk96 alperozturk96 mentioned this pull request Jan 20, 2026
Draft
1 task
@alperozturk96 alperozturk96 force-pushed the fix/upload-receivers branch 3 times, most recently from ee61c40 to ba4acc6 Compare January 26, 2026 10:36
@alperozturk96 alperozturk96 mentioned this pull request Jan 27, 2026
Open
1 task
@alperozturk96
fix(receivers): upload
cfb8c2b 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add documentation and simplify
c997917 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add documentation and simplify
f281768 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
delete unused functions
8ca761a 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add upload finish event for auto upload worker
30eea76 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add upload finish event for auto upload worker
db21780 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add upload finish event for auto upload worker
07d7c1f 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add upload started, added event
71a2ed3 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@github-actions
Copy link

github-actions bot commented Jan 28, 2026

Codacy

SpotBugs

CategoryBaseNew
Bad practice4343
Correctness7474
Dodgy code260258
Experimental11
Internationalization77
Malicious code vulnerability33
Multithreaded correctness3434
Performance4343
Security1818
Total483481

ZetaTom
ZetaTom approved these changes Jan 29, 2026
View reviewed changes
Copy link
Collaborator

@ZetaTom ZetaTom left a comment

Choose a reason for hiding this comment

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

Overall everything seems to work nicely. I've added a few minor suggestions to rephrase some comments.

One thing we need to discuss further is what users expect to see when they upload a file - should the UI reflect that immediately, or should it only be updated in batches (current behaviour). However, this discussion is entirely out of scope for this pull request and a separate issue will be opened for that.

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt
Comment on lines +38 to +42
* ### Triggered when
* - [UploadFileOperation] added
*
* ### Observed by
* - [com.owncloud.android.ui.activity.UploadListActivity.UploadFinishReceiver]
Copy link
Collaborator

@ZetaTom ZetaTom Jan 28, 2026

Choose a reason for hiding this comment

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

I'm not sure if we should keep track of the calling and receiving functions, as they might change in the future. We would then have remember to manually adjust these comments.

Same for sendStarted() and sendFinished().

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt
fun sendFinished(
upload: UploadFileOperation,
uploadResult: RemoteOperationResult<*>,
unlinkedFromRemotePath: String?,
Copy link
Collaborator

@ZetaTom ZetaTom Jan 28, 2026

Choose a reason for hiding this comment

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

I'm not sure what this variable name refers to. I think we should either change this name or add a short explanation.

alperozturk96 and others added 3 commits January 29, 2026 15:09
@alperozturk96 @ZetaTom
Update app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadB…
fa5a187 
…roadcastManager.kt

Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
@alperozturk96 @ZetaTom
Update app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadB…
b64db5e 
…roadcastManager.kt

Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
@alperozturk96 @ZetaTom
Update app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadB…
74b2ad3 
…roadcastManager.kt

Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
@alperozturk96
Copy link
Collaborator Author

alperozturk96 commented Jan 29, 2026

/backport to stable-3.35

@alperozturk96 alperozturk96 merged commit 79c73bf into master Jan 29, 2026
11 of 19 checks passed
@alperozturk96 alperozturk96 deleted the fix/upload-receivers branch January 29, 2026 14:10
@backportbot backportbot bot mentioned this pull request Jan 29, 2026
Merged
@github-actions
Copy link

github-actions bot commented Jan 29, 2026

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/16317.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 29, 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

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@ZetaTom ZetaTom ZetaTom approved these changes

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

Assignees

No one assigned

Labels

3. to review ux-enhancement Improvements that refine user interactions, accessibility, or overall usability

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@alperozturk96 @AndyScherzinger @ZetaTom