Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle late-arriving m.room_key.withheld messages #4310

Merged
merged 5 commits into from
Jul 29, 2024

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jul 10, 2024

Make sure we update the error message for affected events when we receive an m.room_key.withheld message.

Review commit-by-commit.

Requires matrix-org/matrix-rust-sdk-crypto-wasm#136, so won't pass CI yet

@richvdh richvdh requested a review from a team as a code owner July 10, 2024 11:02
Copy link
Member

@andybalaam andybalaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@richvdh
Copy link
Member Author

richvdh commented Jul 11, 2024

Blocked by #4312

@richvdh richvdh added this pull request to the merge queue Jul 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 29, 2024
@richvdh richvdh added this pull request to the merge queue Jul 29, 2024
Merged via the queue into develop with commit dc1cccf Jul 29, 2024
26 checks passed
@richvdh richvdh deleted the rav/withheld_key_stream branch July 29, 2024 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants