Repository navigation
fix(linux): explain default-keyring recovery on every locked-keyring error - #4234
Merged
datlechin merged 3 commits intoNov 12, 2026
Merged
Conversation
…ux MCP token The message now covers accepting the unlock prompt and creating a default keyring in Passwords and Keys. Added tests cover both errors, the recovery text, retry visibility, disabled client controls, and the transition back to Off. Additional assertions preserve the distinct service and portal error messages, and a changelog entry records the fix. Fixes TableProApp#4106
…ng errors map_error returns SecretError::Locked for a missing default keyring on every secret read, so the advice now appends from one shared gettext helper on the API-key, saved-password, duplicate-connection and save surfaces, not only the MCP token.
# Conflicts: # linux/crates/app/src/ui/preferences_dialog/mcp_page.rs
datlechin
enabled auto-merge (squash)
November 12, 2026 18:54
Contributor
Author
|
Appreciate the merge, @datlechin. Every locked-keyring error now carries the steps to create a default keyring in Passwords and Keys, not just the MCP token one. |
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
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.
Summary
map_errorreturnsSecretError::Lockedfor a missing default keyring on every secret read, so the create-a-default-keyring advice belongs on every locked-keyring error, not only the MCP token.keyring_locked_recovery()gettext helper insecret_save_report;remedy()and each surface compose it, so the advice sentence is translated once.Test plan
test tablepro: newa_locked_key_explains_default_keyring_recovery(assistant) and the MCPlocked_token_*tests cover the recovery text;saved_connectionand the duplicate-connection toast assertions updated for the appended advice.Fixes #4106