This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Replace event verification logic with new code in js-sdk #11528
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
…nt-r/cross-user-verification
richvdh
added
the
T-Task
4 tasks
richvdh
force-pushed
the
rav/element-r/shields/new_api
branch
from
a93b8dc
to
a3863fb
Compare
richvdh
force-pushed
the
rav/element-r/shields/new_api
branch
from
ba79422
to
22c192b
Compare
richvdh
commented
Sep 7, 2023
| break; | ||
|
|
||
| case EventShieldReason.MISMATCHED_SENDER_KEY: | ||
| shieldReasonMessage = _t("Encrypted by an unverified session"); |
There was a problem hiding this comment.
this doesn't seem like the right error, but it preserves existing functionality (this situation replicates the code path at https://github.com/matrix-org/matrix-react-sdk/pull/11528/files#diff-9ff5535291b7c2e655ccd3d02c4f632b6f2dc9c30072514641e31c2a8751c57eL593)
…nt-r/cross-user-verification
richvdh
force-pushed
the
rav/element-r/shields/new_api
branch
from
980a5c3
to
e5fb21d
Compare
richvdh
changed the base branch from
develop
to
florianduros/element-r/cross-user-verification
This is required because a transition from "valid event" to "unencrypted event" no longer triggers a state change, so the component does not render itself. Previously, this would be a transition from `verified: E2EState.Normal` to `verified: null`.
richvdh
force-pushed
the
rav/element-r/shields/new_api
branch
from
e5fb21d
to
154a121
Compare
weeman1337
approved these changes
Sep 8, 2023
| // If the verification state changed, the height might have changed | ||
| if (prevState.verified !== this.state.verified && this.props.onHeightChanged) { | ||
| // If the shield state changed, the height might have changed. | ||
| // XXX: does the shield *actually* cause a change in height? Not sure. |
There was a problem hiding this comment.
I did some tests with different layouts. As far as I can see the shield doesn't change the height.
Base automatically changed from
florianduros/element-r/cross-user-verification
to
develop
September 18, 2023 16:34
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Part of element-hq/element-web#25321.
Rip out the existing verification magic, and replace it with the new API introduced in matrix-org/matrix-js-sdk#3693.
Requires matrix-org/matrix-js-sdk#3693.Based on #11364
This change is marked as an internal change (Task), so will not be included in the changelog.