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

Do not rotate MatrixRTC media encryption key when a new member joins a session #4472

Merged
merged 2 commits into from
Oct 25, 2024

Conversation

hughns
Copy link
Member

@hughns hughns commented Oct 25, 2024

This change reverts #4422.

Instead, the rotation when a new member joins will be reintroduced as part of supporting to-device based MatrixRTC encryption key distribution.

Checklist

  • Tests written for new code (and old code if feasible).
  • New or updated public/exported symbols have accurate TSDoc documentation.
  • Linter and other CI checks pass.
  • Sign-off given on the changes (see CONTRIBUTING.md).

…a call

This change reverts #4422.

Instead, the rotation when a new member joins will be reintroduced as part of supporting to-device based MatrixRTC encryption key distribution.
@hughns hughns added the T-Feature Request to add a new feature which does not exist right now label Oct 25, 2024
@hughns hughns added T-Enhancement and removed T-Feature Request to add a new feature which does not exist right now labels Oct 25, 2024
@hughns
Copy link
Member Author

hughns commented Oct 25, 2024

I'm unsure whether this is the correct label type for the changelog. Please can someone sanity check?

@hughns hughns marked this pull request as ready for review October 25, 2024 09:03
@hughns hughns requested a review from a team as a code owner October 25, 2024 09:03
Copy link

@fkwp fkwp left a comment

Choose a reason for hiding this comment

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

LGTM

@hughns hughns added this pull request to the merge queue Oct 25, 2024
@hughns hughns removed this pull request from the merge queue due to a manual request Oct 25, 2024
Copy link
Contributor

@toger5 toger5 left a comment

Choose a reason for hiding this comment

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

Thanks!!

src/matrixrtc/MatrixRTCSession.ts Outdated Show resolved Hide resolved
@hughns hughns enabled auto-merge October 25, 2024 13:29
@hughns hughns added this pull request to the merge queue Oct 25, 2024
Merged via the queue into develop with commit 0a29063 Oct 25, 2024
26 checks passed
@hughns hughns deleted the hughns/revert-pr4422 branch October 25, 2024 13:49
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.

3 participants