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

Don't back up keys that we got from backup #3934

Merged
merged 10 commits into from
Dec 7, 2023
Merged

Don't back up keys that we got from backup #3934

merged 10 commits into from
Dec 7, 2023

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Nov 30, 2023 •
edited by github-actions bot
Loading

Fixes element-hq/element-web#26347

I also threw in a proper enum for the key source, but I can remove that

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

Here's what your changelog entry will look like:

🐛 Bug Fixes

@uhoreg uhoreg requested a review from a team as a code owner November 30, 2023 20:17
@uhoreg uhoreg requested a review from richvdh December 1, 2023 00:43
BillCarsonFr
BillCarsonFr reviewed Dec 1, 2023
View reviewed changes
src/crypto-api.ts Outdated Show resolved Hide resolved
richvdh
richvdh requested changes Dec 1, 2023
View reviewed changes
src/crypto-api.ts Outdated Show resolved Hide resolved
src/crypto-api.ts Outdated Show resolved Hide resolved
@uhoreg uhoreg requested a review from richvdh December 1, 2023 23:38
@richvdh richvdh mentioned this pull request Dec 4, 2023
Closed
richvdh
richvdh requested changes Dec 4, 2023
View reviewed changes
src/crypto-api.ts Outdated Show resolved Hide resolved
src/rust-crypto/rust-crypto.ts Outdated Show resolved Hide resolved
src/rust-crypto/rust-crypto.ts Outdated Show resolved Hide resolved
spec/unit/rust-crypto/rust-crypto.spec.ts Show resolved Hide resolved
@uhoreg uhoreg requested a review from richvdh December 4, 2023 23:38
richvdh
richvdh approved these changes Dec 5, 2023
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

lgtm!

@uhoreg uhoreg enabled auto-merge December 5, 2023 15:01
@uhoreg uhoreg added this pull request to the merge queue Dec 6, 2023
@richvdh richvdh removed this pull request from the merge queue due to a manual request Dec 6, 2023
@richvdh richvdh added this pull request to the merge queue Dec 7, 2023
Merged via the queue into matrix-org:develop with commit 1d13098 Dec 7, 2023
22 checks passed
@richvdh richvdh mentioned this pull request Dec 13, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BillCarsonFr BillCarsonFr BillCarsonFr left review comments

@richvdh richvdh richvdh approved these changes

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

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

Assignees
No one assigned
Labels
T-Defect
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Element-R: keys imported from backup are backed up again
3 participants
@uhoreg @richvdh @BillCarsonFr