Fix logic in DeviceListener #30230
Merged
Fix logic in DeviceListener #30230
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
SETUP_ENCRYPTION tries to set up everything (4S, cross-signing and key backup), rather than just setting up encryption, as its name would imply. crossSigningReady == false happens when the user's device isn't verified, so it should trigger VERIFY_THIS_SESSION rather than SETUP_ENCRYPTION
rather than falling back to the SETUP_ENCRYPTION catch-all. Also, remove SETUP_ENCRYPTION since it is no longer used.
(almost) all the other functions that use make decisions based on Kind use switch statements
uhoreg
requested review from
dbkr,
florianduros,
a team and
andybalaam
and removed request for
a team
andybalaam
approved these changes
Jun 30, 2025
dbkr
approved these changes
Jun 30, 2025
Merged
via the queue into
element-hq:develop
with commit Jun 30, 2025
3d56aa7
41 of 43 checks passed
richvdh
reviewed
Jun 30, 2025
| }); | ||
| showSetupEncryptionToast(SetupKind.SET_UP_ENCRYPTION); | ||
| // If we get here, then we are verified, have key backup, and | ||
| // 4S, but crypto.isCrossSigningReady returned false, which |
There was a problem hiding this comment.
crypto.isCrossSigningReady returned false
Are you sure this is the only way we can get here?
For example, what happens if isCrossSigningReady returns true, but isSecretStorageReady returns false?
In any case, please can you keep the logic to log all the flags, so that we can debug why we are falling into the else case?
There was a problem hiding this comment.
Ugh. I typo'ed the comment. It should say "but crypto.isSecretStorageReady returned false". (If isCrossSigningReady returns false, then isCurrentDeviceTrusted will be false and we'll run the first branch of the if statement.) I'll make a new PR to fix the comment and reinstate the logging.
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.
Fixes #29883
SETUP_ENCRYPTION tried to set up all of encryption (4S, cross-signing, key backup), but we now have it split into different stages, so it is obsolete.
Review commit-by-commit
Checklist
public/exportedsymbols have accurate TSDoc documentation.