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

crypto-js: wait for device updates in getUserDevices (#1790)

Browse Source 
Wait for up to a second for any in-flight device list updates to complete.
This commit is contained in:
Richard van der Hoff
2023-04-20 08:58:26 +01:00
committed by GitHub
parent a88f53ee85
commit 0da8e56a68
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bindings/matrix-sdk-crypto-js/CHANGELOG.md
View File

@@ -1,3 +1,8 @@
# v0.1.0-alpha.7
- In `OlmMachine.getUserDevices`, wait a limited time for any in-flight
device-list updates to complete.
# v0.1.0-alpha.6 # v0.1.0-alpha.6
- Add new accessor `InboundGroupSession.senderKey`. - Add new accessor `InboundGroupSession.senderKey`.

7
bindings/matrix-sdk-crypto-js/src/machine.rs
View File

@@ -1,6 +1,6 @@
//! The crypto specific Olm objects. //! The crypto specific Olm objects.
use std::{collections::BTreeMap, ops::Deref}; use std::{collections::BTreeMap, ops::Deref, time::Duration};
use futures_util::StreamExt; use futures_util::StreamExt;
use js_sys::{Array, Function, Map, Promise, Set}; use js_sys::{Array, Function, Map, Promise, Set};
@@ -582,7 +582,10 @@ impl OlmMachine {
let me = self.inner.clone(); let me = self.inner.clone();
future_to_promise::<_, device::UserDevices>(async move { future_to_promise::<_, device::UserDevices>(async move {
Ok(me.get_user_devices(&user_id, None).await.map(Into::into)?) // wait for up to a second for any in-flight device list requests to complete.
// The reason for this isn't so much to avoid races (some level of raciness is
// inevitable for this method) but to make testing easier.
Ok(me.get_user_devices(&user_id, Some(Duration::from_secs(1))).await.map(Into::into)?)
}) })
} }