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

ElementR: Add CryptoApi.findVerificationRequestDMInProgress #3601

Merged
merged 31 commits into from
Jul 31, 2023
Merged

ElementR: Add CryptoApi.findVerificationRequestDMInProgress #3601

merged 31 commits into from
Jul 31, 2023

Conversation

florianduros
Copy link
Contributor

@florianduros florianduros commented Jul 13, 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)
  • In the first implementation, I processed the event in the EventDecryptor. However: OlmMachine::receiveVerificationEvent and OlmMachine::decryptRoomEvent don't have the same return type. And in the case of receiveVerificationEvent, we don't litterally decrypt the room event. So I added the processing of key verification request in onKeyVerificationRequest
  • Moved getSyncResponse to share it accross crypto.spec.ts and verification.spec.ts

After the PR merge, the react-sdk will be updated to provide the new userId parameter matrix-org/matrix-react-sdk#11292

Here's what your changelog entry will look like:

✨ Features

  • ElementR: Add CryptoApi.findVerificationRequestDMInProgress (#3601). Contributed by @florianduros.

@florianduros florianduros mentioned this pull request Jul 13, 2023
Closed
@florianduros florianduros force-pushed the florianduros/element-r/findVerificationRequestDMInProgress branch from f66dfaa to bac78dc Compare July 17, 2023 15:28
@florianduros florianduros force-pushed the florianduros/element-r/findVerificationRequestDMInProgress branch from faf578e to 94618d4 Compare July 17, 2023 15:53
@florianduros florianduros force-pushed the florianduros/element-r/findVerificationRequestDMInProgress branch from 94618d4 to be22167 Compare July 17, 2023 15:58
@florianduros florianduros force-pushed the florianduros/element-r/findVerificationRequestDMInProgress branch from be22167 to b8045e2 Compare July 17, 2023 16:09
@florianduros florianduros marked this pull request as ready for review July 17, 2023 16:28
@florianduros florianduros requested a review from a team as a code owner July 17, 2023 16:28
@florianduros florianduros force-pushed the florianduros/element-r/findVerificationRequestDMInProgress branch from 1724cdd to 16adc86 Compare July 26, 2023 14:45
richvdh
richvdh previously requested changes Jul 27, 2023
View reviewed changes
spec/unit/rust-crypto/rust-crypto.spec.ts Outdated Show resolved Hide resolved
src/rust-crypto/rust-crypto.ts Outdated Show resolved Hide resolved
@florianduros florianduros force-pushed the florianduros/element-r/findVerificationRequestDMInProgress branch from 092e541 to 1d0a7b6 Compare July 27, 2023 12:33
t3chguy
t3chguy approved these changes Jul 31, 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

@t3chguy t3chguy dismissed richvdh’s stale review July 31, 2023 15:00

Addressed & unavailable

@florianduros florianduros added this pull request to the merge queue Jul 31, 2023
Merged via the queue into develop with commit 0ada980 Jul 31, 2023
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richvdh richvdh richvdh left review comments

@t3chguy t3chguy t3chguy approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@florianduros @richvdh @t3chguy