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.

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

crypto: Pass room id and session id to room_keys_withheld_received_stream #3674

Merged
merged 1 commit into from
Jul 10, 2024

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jul 9, 2024

Followup on #3660: I realised I didn't want to have to parse the room_id and session_id out of the messages again.

@richvdh richvdh requested a review from a team as a code owner July 9, 2024 20:39
@richvdh richvdh requested review from Hywan and removed request for a team July 9, 2024 20:39
@richvdh richvdh force-pushed the rav/withheld_key_stream_again branch from e7f0a2b to a0fdadb Compare July 9, 2024 20:40
Copy link

codecov bot commented Jul 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.35%. Comparing base (2d3e2da) to head (a0fdadb).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3674   +/-   ##
=======================================
  Coverage   84.34%   84.35%           
=======================================
  Files         259      259           
  Lines       26723    26727    +4     
=======================================
+ Hits        22540    22546    +6     
+ Misses       4183     4181    -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -913,6 +913,20 @@ impl From<&InboundGroupSession> for RoomKeyInfo {
}
}

/// Information on a room key that has been withheld
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct RoomKeyWithheldInfo {
Copy link
Contributor

Choose a reason for hiding this comment

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

Might make sense to use this in the store as well, maybe? But probably not worth to do a migration for that.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeahhh. Maybe some other time.

@richvdh richvdh merged commit 8d54bd9 into main Jul 10, 2024
40 checks passed
@richvdh richvdh deleted the rav/withheld_key_stream_again branch July 10, 2024 08:49
richvdh added a commit to matrix-org/matrix-rust-sdk-crypto-wasm that referenced this pull request Jul 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants