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

crypto: Don't await while holding a sync lock

master
Damir Jelić 2021-05-27 16:24:00 +02:00
parent 12619ab8b3
commit 8a5a0e511e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix_sdk_crypto/src/verification/requests.rs
View File

@ -389,7 +389,9 @@ impl VerificationRequest {
) -> Result<(), CryptoStoreError> { ) -> Result<(), CryptoStoreError> {
let content = content.into(); let content = content.into();
if let InnerRequest::Ready(s) = &*self.inner.lock().unwrap() { let inner = self.inner.lock().unwrap().clone();
if let InnerRequest::Ready(s) = inner {
s.receive_start(sender, content).await?; s.receive_start(sender, content).await?;
} else { } else {
warn!( warn!(
@ -433,7 +435,7 @@ impl VerificationRequest {
} }
} }
#[derive(Debug)] #[derive(Clone, Debug)]
enum InnerRequest { enum InnerRequest {
Created(RequestState<Created>), Created(RequestState<Created>),
Requested(RequestState<Requested>), Requested(RequestState<Requested>),