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.

Sign up for GitHub

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

Jump to bottom

MatrixRTC: refactor MatrixRTCSession media encryption key logic into EncryptionManager #4612

Merged
merged 3 commits into from
Jan 14, 2025
Merged

MatrixRTC: refactor MatrixRTCSession media encryption key logic into EncryptionManager #4612

merged 3 commits into from
Jan 14, 2025

Conversation

toger5
Copy link
Contributor

@toger5 toger5 commented Jan 10, 2025 •
edited by hughns
Loading

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).

@toger5 toger5 force-pushed the toger5/refactor-matrixrtxsession-part5-keymanager branch 2 times, most recently from 09783df to 0ea6e87 Compare January 10, 2025 15:55
@toger5 toger5 force-pushed the toger5/refactor-matrixrtcsession-part4-membershipManager-session-api branch from 00d4e72 to c798a1f Compare January 10, 2025 16:29
@toger5 toger5 force-pushed the toger5/refactor-matrixrtxsession-part5-keymanager branch from 0ea6e87 to 1dddd19 Compare January 10, 2025 16:34
@toger5 toger5 marked this pull request as ready for review January 10, 2025 16:34
@toger5 toger5 requested a review from a team as a code owner January 10, 2025 16:34
@toger5 toger5 requested review from AndrewFerr and removed request for a team January 10, 2025 16:34
@hughns hughns added T-Task Tasks for the team like planning and removed T-Enhancement labels Jan 13, 2025
@hughns hughns changed the title MatrixRTC: refactor MatrixRTCSession EncryptionManager split logic into new file. MatrixRTC: refactor MatrixRTCSession media encryption key logic into EncryptionManager Jan 13, 2025
hughns
hughns requested changes Jan 13, 2025
View reviewed changes
Copy link
Member

@hughns hughns left a comment

Choose a reason for hiding this comment

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

A bit of cleanup needed, but generally sane.

src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
src/matrixrtc/MatrixRTCSession.ts Outdated Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
Base automatically changed from toger5/refactor-matrixrtcsession-part4-membershipManager-session-api to develop January 13, 2025 13:43
@toger5 toger5 force-pushed the toger5/refactor-matrixrtxsession-part5-keymanager branch from 532ecee to bc94065 Compare January 13, 2025 14:49
@toger5
Copy link
Contributor Author

toger5 commented Jan 13, 2025 •
edited
Loading

I rebased this onto develop. So this probably broke the review progress state.
I hope this is fine in this case because it seems like the full PR was already reviewed?
Its just the last commit that has changed.

hughns
hughns requested changes Jan 13, 2025
View reviewed changes
Copy link
Member

@hughns hughns left a comment

Choose a reason for hiding this comment

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

Just some more changes to the TS doc, please. 👍

src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Outdated Show resolved Hide resolved
src/matrixrtc/EncryptionManager.ts Show resolved Hide resolved
@hughns hughns assigned hughns and unassigned hughns Jan 13, 2025
hughns
hughns approved these changes Jan 13, 2025
View reviewed changes
Copy link
Member

@hughns hughns left a comment

Choose a reason for hiding this comment

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

Looks great 👍

@toger5 toger5 added this pull request to the merge queue Jan 13, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 13, 2025
@toger5 toger5 added this pull request to the merge queue Jan 13, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 13, 2025
@hughns hughns added this pull request to the merge queue Jan 14, 2025
@hughns
Copy link
Member

hughns commented Jan 14, 2025

The failures look like flakes on tests unrelated to this PR.

Merged via the queue into develop with commit 9134471 Jan 14, 2025
38 checks passed
@hughns hughns deleted the toger5/refactor-matrixrtxsession-part5-keymanager branch January 14, 2025 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hughns hughns hughns approved these changes

@AndrewFerr AndrewFerr Awaiting requested review from AndrewFerr AndrewFerr is a code owner automatically assigned from matrix-org/element-call-reviewers

Assignees
No one assigned
Labels
T-Task Tasks for the team like planning
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@toger5 @hughns