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

Fix racing between one-time-keys processing and sync #3327

Merged
merged 1 commit into from
Apr 27, 2023
Merged

Fix racing between one-time-keys processing and sync #3327

merged 1 commit into from
Apr 27, 2023

Conversation

florianduros
Copy link
Contributor

@florianduros florianduros commented Apr 27, 2023 •
edited by github-actions bot
Loading

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)

Closes element-hq/element-web#25214

Notes: Fix racing between one-time-keys processing and sync

Here's what your changelog entry will look like:

🐛 Bug Fixes

@florianduros florianduros marked this pull request as ready for review April 27, 2023 09:11
@florianduros florianduros requested a review from a team as a code owner April 27, 2023 09:11
t3chguy
t3chguy approved these changes Apr 27, 2023
View reviewed changes
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

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

Looks sane

@florianduros florianduros added this pull request to the merge queue Apr 27, 2023
Merged via the queue into develop with commit 1631d6f Apr 27, 2023
@florianduros florianduros deleted the florianduros/fix/upload-key-race-sync branch April 27, 2023 10:40
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Jul 31, 2023
@su-ex
Merge tag 'v25.1.0' into sc
399467c 
* Deprecate MatrixClient::resolveRoomAlias ([\matrix-org#3316](matrix-org#3316)).
* add client method to remove pusher ([\matrix-org#3324](matrix-org#3324)). Contributed by @kerryarchibald.
* Implement MSC 3981 ([\matrix-org#3248](matrix-org#3248)). Fixes element-hq/element-web#25021. Contributed by @justjanne.
* Added `Room.getLastLiveEvent` and `Room.getLastThread`. Deprecated `Room.lastThread` in favour of `Room.getLastThread`. ([\matrix-org#3321](matrix-org#3321)).
* Element-R: wire up device lists ([\matrix-org#3272](matrix-org#3272)). Contributed by @florianduros.
* Node 20 support ([\matrix-org#3302](matrix-org#3302)).
* Fix racing between one-time-keys processing and sync ([\matrix-org#3327](matrix-org#3327)). Fixes element-hq/element-web#25214. Contributed by @florianduros.
* Fix lack of media when a user reconnects ([\matrix-org#3318](matrix-org#3318)).
* Fix TimelineWindow getEvents exploding if no neigbouring timeline ([\matrix-org#3285](matrix-org#3285)). Fixes element-hq/element-web#25104.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t3chguy t3chguy t3chguy approved these changes

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

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

@richvdh richvdh Awaiting requested review from richvdh

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: one-time-keys processing is racy
2 participants
@florianduros @t3chguy