Fix the warning for messages from unsigned devices #3743
Merged
Conversation
This file contains 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
t3chguy
approved these changes
Sep 20, 2023
richvdh
commented
Sep 20, 2023
| @@ -2738,6 +2738,8 @@ export class Crypto extends TypedEventEmitter<CryptoEvent, CryptoEventHandlerMap | |||
| const senderId = event.getSender(); | |||
| if (!senderId || encryptionInfo.mismatchedSender) { | |||
| // something definitely wrong is going on here | |||
|
|
|||
| // previously: E2EState.Warning -> E2ePadlockUnverified -> Red/"Encrypted by an unverified session" | |||
There was a problem hiding this comment.
these "previously" comments relate to the old logic in EventTile (https://github.com/matrix-org/matrix-react-sdk/blob/v3.80.1/src/components/views/rooms/EventTile.tsx#L579-L637). I found them useful for double-checking the logic.
richvdh
commented
Sep 20, 2023
| @@ -1649,6 +1649,7 @@ function rustEncryptionInfoToJsEncryptionInfo( | |||
| if (shieldState.message === null) { | |||
| shieldReason = null; | |||
| } else if (shieldState.message === "Encrypted by an unverified user.") { | |||
| // this case isn't actually used with lax shield semantics. | |||
There was a problem hiding this comment.
this is unrelated, but something I came across while I was figuring out what happened and it doesn't feel like worth making a separate PR for
richvdh
changed the title
richvdh
changed the title
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.
#3693 attempted to port the logic for event shields from react-sdk to js-sdk, but I seem to have messed up this case.
I've double checked all the logic and... it's hopefully right this time.
Here's what your changelog entry will look like:
🐛 Bug Fixes