fix(account): resolve the active user deterministically when picking which duplicate to keep - #6595
Merged
Merged
Conversation
…which duplicate to keep scheduleDuplicateAccountsForDeletion() picked a duplicate to keep via an unordered current=1 lookup, which can disagree with whichever row a live session/background sync is actually bound to if a past bug left more than one row marked current=true for the same account. Deleting that row then trips a foreign key constraint on any in-flight write still referencing it. Make getActiveUser()/getActiveUserObservable()/getActiveUserSynchronously() deterministic via ORDER BY id DESC LIMIT 1, and have scheduleDuplicateAccountsForDeletion() prefer whichever row that resolves to over the current flag. Assisted-by: Claude:claude-sonnet-5 Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
mahibi
force-pushed
the
improveScheduleDuplicateAccountsForDeletion
branch
from
August 27, 2026 10:00
f1a311d to
f4157de
Compare
Contributor
|
APK file: https://github.com/nextcloud/talk-android/actions/runs/33061103029/artifacts/9644884231 |
Collaborator
Author
|
/backport to stable-25.0.x |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
scheduleDuplicateAccountsForDeletion() picked a duplicate to keep via an unordered current=1 lookup, which can disagree with whichever row a live session/background sync is actually bound to if a past bug left more than one row marked current=true for the same account. Deleting that row then trips a foreign key constraint on any in-flight write still referencing it.
Make getActiveUser()/getActiveUserObservable()/getActiveUserSynchronously() deterministic via ORDER BY id DESC LIMIT 1, and have scheduleDuplicateAccountsForDeletion() prefer whichever row that resolves to over the current flag.
🏁 Checklist
/backport to stable-xx.x🤖 AI (if applicable)