mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-18 21:52:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Use a match arm when evaluating session comparison results

Browse Source
This commit is contained in:
Damir Jelić
2024-09-25 15:54:32 +02:00
parent 2fc4aacdd0
commit e5bd7602e4
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/matrix-sdk-crypto/src/machine/mod.rs
View File

@@ -857,9 +857,9 @@ impl OlmMachine {
#[instrument(
skip_all,
// This function is only ever called by add_room_key via
// handle_decrypted_to_device_event, so sender, sender_key, and algorithm are
// already recorded.
// This function is only ever called by add_room_key via
// handle_decrypted_to_device_event, so sender, sender_key, and algorithm are
// already recorded.
fields(room_id = ? content.room_id, session_id)
)]
async fn handle_key(
@@ -888,17 +888,21 @@ impl OlmMachine {
session.sender_data = sender_data;
if self.store().compare_group_session(&session).await? == SessionOrdering::Better {
info!("Received a new megolm room key");
match self.store().compare_group_session(&session).await? {
SessionOrdering::Better => {
info!("Received a new megolm room key");
Ok(Some(session))
} else {
warn!(
"Received a megolm room key that we already have a better version of, \
discarding",
);
Ok(Some(session))
}
comparison_result => {
warn!(
?comparison_result,
"Received a megolm room key that we already have a better version \
of, discarding"
);
Ok(None)
Ok(None)
}
}
}
Err(e) => {