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

Add bindings for room key backup & recovery #7

Merged
merged 9 commits into from
Aug 1, 2023
Merged

Add bindings for room key backup & recovery #7

merged 9 commits into from
Aug 1, 2023

Conversation

AndrewFerr
Copy link
Member

This was adapted from matrix-org/matrix-rust-sdk#2196, which added key backup support to the JS bindings.

Note that this depends on matrix-rust-sdk being able to store backup keys.

@AndrewFerr AndrewFerr self-assigned this Jul 14, 2023
@AndrewFerr
Copy link
Member Author

This shouldn't be reviewed until matrix-org/matrix-rust-sdk#2196 is, at which point I'll pull in any changes made during that review. I'll leave this PR as a draft until then.

@AndrewFerr AndrewFerr marked this pull request as draft July 20, 2023 12:07
@AndrewFerr
Copy link
Member Author

matrix-org/matrix-rust-sdk#2196 is now matrix-org/matrix-rust-sdk-crypto-wasm#10, and is merged, so taking this out of draft.

@AndrewFerr AndrewFerr marked this pull request as ready for review July 25, 2023 15:37
@AndrewFerr
Copy link
Member Author

Note that the WASM version of key backup support has settled down, so this PR should be ready to be merged.

poljar
poljar approved these changes Aug 1, 2023
View reviewed changes
Copy link
Contributor

@poljar poljar 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. Left a minor comment.

src/machine.rs Show resolved Hide resolved
@AndrewFerr AndrewFerr mentioned this pull request Aug 1, 2023
Merged
@AndrewFerr AndrewFerr merged commit 22ac78d into main Aug 1, 2023
7 checks passed
@AndrewFerr
Copy link
Member Author

AndrewFerr commented Aug 1, 2023 •
edited
Loading

TIL GitHub's rebase merges always make new commits instead of just fast-fowarding. For the sake of preserving the original branch, I'll just force push the PR branch to main (which is a zero-diff change), and will use either merge commits or local pushes from now on.

EDIT: never mind, the main branch is protected. I'll just take the L 🙃

@poljar
Copy link
Contributor

poljar commented Aug 1, 2023

You'll have to use merge-commits if you want to preserve the hashes and use GitHub's UI.

@AndrewFerr AndrewFerr deleted the af/key-backups branch August 2, 2023 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@poljar poljar poljar approved these changes

Assignees

@AndrewFerr AndrewFerr

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AndrewFerr @poljar