Avoid using accessSecretStorage to create 4S #30244
Merged
Conversation
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
The only place where verifyUser is called already checks that cross-signing is set up. (The function name is also incorrect, since it checks for the cross-signing key, and not for 4S.)
Send the user to the Encryption settings tab instead
uhoreg
changed the title
dbkr
approved these changes
Jul 3, 2025
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
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.
Historically,
accessSecretStorageeither allowed the app to fetch/store secrets in 4S, or bootstrapped 4S/Cross-Signing/key backup, etc. Recent designs separate out key backup (Key Storage) and 4S (Recovery). This PR removes some calls toaccessSecretStoragethat were using it to create key backup or 4S, and instead takes the user to the Encryption settings tab, which is where these are handled in the new designs.Fixes #30137
Review commit-by-commit