Route existing backups to recovery key entry - #7320
Closed
pi0n00r wants to merge 1 commit into
Closed
Conversation
Offer the existing recovery-key confirmation flow when a server backup is present even if local recovery is disabled. Propagate Rust import failures through the application recovery exception boundary instead of treating them as success.
|
|
Contributor
|
Thank you for your contribution! Here are a few things to check in the PR to ensure it's reviewed as quickly as possible:
|
Author
|
Thank you for considering this contribution. We will not sign the Element CLA because its commercial-relicensing terms fall outside our contribution policy. We are therefore withdrawing the contribution while preserving the patch in our fork. Element is welcome to implement the remedy independently. |
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.
Content
DISABLED, show and route to the existing enter-recovery-key flow instead of offering to set up new recovery.RustRecoveryException.Importthrough the application recovery-exception boundary instead of treating the import failure as a successful recovery.Motivation and context
Users with an existing server backup can reach a locally disabled recovery state. Offering setup-new recovery in that state sends them down the wrong path; the existing key-entry flow is the appropriate route.
Separately, an SDK room-key import failure must remain a failure so the UI can report it rather than proceeding as though recovery succeeded.
Related symptom report: #7283. This change may improve routing and import-error reporting for overlapping “key storage out of sync” cases, but it does not claim to fix that issue's reported incorrect-key cause or every historical Megolm restore failure.
Screenshots / GIFs
Not provided. The change reuses the existing recovery-key confirmation content and flow.
Tests
Focused tests were added for the new routing decision, its click target, and import-exception mapping.
Local tests were not run because the required Android toolchain was unavailable. GitHub-hosted PR CI is requested as the test substrate.
Tested devices
Checklist