Skip to content
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

Bugfix: Change database query to only return uploads for right account #12516

Merged
merged 1 commit into from
Feb 14, 2024
Merged

Bugfix: Change database query to only return uploads for right account #12516

merged 1 commit into from
Feb 14, 2024

Conversation

JonasMayerDev
Copy link
Collaborator

@JonasMayerDev JonasMayerDev commented Feb 6, 2024 •
edited
Loading

Before:
Screenshot_2024-02-06_14-18-36

After:
Screenshot_2024-02-06_14-20-33
Screenshot_2024-02-06_14-21-10

Fixes:
Upload Worker queries uploads for wrong account and uploads it in wrong account.
-> Also leads to upload conflicts, so maybe also causes: #11974
Multiple other inconsistencies.
Fixes #11088

  • Tests written, or not not needed

@JonasMayerDev JonasMayerDev force-pushed the only_upload_for_right_account branch 2 times, most recently from 1c1e593 to 7027c5b Compare February 7, 2024 14:05
@joshtrichards
Copy link
Member

joshtrichards commented Feb 7, 2024 •
edited
Loading

I wonder if this would also help with these reports? 🤔 #11088

@JonasMayerDev
Copy link
Collaborator Author

JonasMayerDev commented Feb 9, 2024 •
edited
Loading

I wonder if this would also help with these reports? 🤔 #11088

Yes, it probably fixes this issue too. As far as I understand, the previous behavior uploaded files always to the currently active account (depending on in which account the upload worker was started and which upload worker is faster in working through the upload list), and it would ignore to which account it should upload, so autoupload from account A would upload to the currently active account B...
Thanks for pointing that related issue out :)

@JonasMayerDev JonasMayerDev mentioned this pull request Feb 9, 2024
Merged
1 task
@github-actions GitHub Actions
Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/12516.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 GitHub Actions
Copy link

Codacy

Lint

TypemasterPR
Warnings6969
Errors33

SpotBugs

CategoryBaseNew
Bad practice6868
Correctness7272
Dodgy code358358
Experimental22
Internationalization77
Malicious code vulnerability22
Multithreaded correctness66
Performance5656
Security1818
Total589589

@JonasMayerDev JonasMayerDev merged commit f59caa7 into master Feb 14, 2024
20 checks passed
@delete-merged-branch delete-merged-branch bot deleted the only_upload_for_right_account branch February 14, 2024 03:40
@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.29.0 milestone Feb 14, 2024
@AndyScherzinger
Copy link
Member

/backport to stable-3.28

@backportbot backportbot bot mentioned this pull request Feb 14, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alperozturk96 alperozturk96 alperozturk96 approved these changes

@ZetaTom ZetaTom ZetaTom approved these changes

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Nextcloud App 3.29.0
Development

Successfully merging this pull request may close these issues.

Autoupload uploads to wrong account when multiple accounts are present on client
5 participants
@JonasMayerDev @joshtrichards @AndyScherzinger @alperozturk96 @ZetaTom