char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Remove some duplicate code

master
Damir Jelić 2021-06-03 21:20:09 +02:00
parent cbcf673d21
commit cf98681f19
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
matrix_sdk_crypto/src/verification/mod.rs
View File

@ -25,6 +25,7 @@ use matrix_sdk_common::{
events::{
key::verification::{
cancel::{CancelCode, CancelEventContent, CancelToDeviceEventContent},
done::{DoneEventContent, DoneToDeviceEventContent},
Relation,
},
AnyMessageEventContent, AnyToDeviceEventContent,
@ -54,6 +55,24 @@ pub struct Done {
verified_master_keys: Arc<[UserIdentities]>,
}
impl Done {
pub fn as_content(&self, flow_id: &FlowId) -> OutgoingContent {
match flow_id {
FlowId::ToDevice(t) => AnyToDeviceEventContent::KeyVerificationDone(
DoneToDeviceEventContent::new(t.to_owned()),
)
.into(),
FlowId::InRoom(r, e) => (
r.to_owned(),
AnyMessageEventContent::KeyVerificationDone(DoneEventContent::new(Relation::new(
e.to_owned(),
))),
)
.into(),
}
}
}
#[derive(Clone, Debug)]
pub struct Cancelled {
cancel_code: CancelCode,

14
matrix_sdk_crypto/src/verification/sas/sas_state.rs
View File

@ -1064,19 +1064,7 @@ impl SasState<Done> {
}
pub fn done_content(&self) -> OutgoingContent {
match self.verification_flow_id.as_ref() {
FlowId::ToDevice(t) => AnyToDeviceEventContent::KeyVerificationDone(
DoneToDeviceEventContent::new(t.to_owned()),
)
.into(),
FlowId::InRoom(r, e) => (
r.clone(),
AnyMessageEventContent::KeyVerificationDone(DoneEventContent::new(Relation::new(
e.clone(),
))),
)
.into(),
}
self.state.as_content(self.verification_flow_id.as_ref())
}
/// Get the list of verified devices.