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

refactor(ui): Prettify the two sync tasks a bit

Browse Source
This commit is contained in:
Damir Jelić
2025-01-16 16:29:08 +01:00
parent b52cf8327a
commit 842d32d41b
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
crates/matrix-sdk-ui/src/sync_service.rs
View File

@@ -183,33 +183,38 @@ impl SyncTaskSupervisor {
(room_list_task, encryption_sync_task)
}
fn check_if_expired(err: &matrix_sdk::Error) -> bool {
err.client_api_error_kind() == Some(&ruma::api::client::error::ErrorKind::UnknownPos)
}
async fn encryption_sync_task(
encryption_sync: Arc<EncryptionSyncService>,
sender: Sender<TerminationReport>,
sync_permit_guard: OwnedMutexGuard<EncryptionSyncPermit>,
) {
use encryption_sync_service::Error;
let encryption_sync_stream = encryption_sync.sync(sync_permit_guard);
pin_mut!(encryption_sync_stream);
let (is_error, has_expired) = loop {
let res = encryption_sync_stream.next().await;
match res {
match encryption_sync_stream.next().await {
Some(Ok(())) => {
// Carry on.
}
Some(Err(err)) => {
// If the encryption sync error was an expired session, also expire the
// room list sync.
let has_expired = if let encryption_sync_service::Error::SlidingSync(err) = &err
{
err.client_api_error_kind()
== Some(&ruma::api::client::error::ErrorKind::UnknownPos)
let has_expired = if let Error::SlidingSync(err) = &err {
Self::check_if_expired(err)
} else {
false
};
if !has_expired {
error!("Error while processing encryption in sync service: {err:#}");
}
break (true, has_expired);
}
None => {
@@ -235,27 +240,29 @@ impl SyncTaskSupervisor {
room_list_service: Arc<RoomListService>,
sender: Sender<TerminationReport>,
) {
use room_list_service::Error;
let room_list_stream = room_list_service.sync();
pin_mut!(room_list_stream);
let (is_error, has_expired) = loop {
let res = room_list_stream.next().await;
match res {
match room_list_stream.next().await {
Some(Ok(())) => {
// Carry on.
}
Some(Err(err)) => {
// If the room list error was an expired session, also expire the
// encryption sync.
let has_expired = if let room_list_service::Error::SlidingSync(err) = &err {
err.client_api_error_kind()
== Some(&ruma::api::client::error::ErrorKind::UnknownPos)
let has_expired = if let Error::SlidingSync(err) = &err {
Self::check_if_expired(err)
} else {
false
};
if !has_expired {
error!("Error while processing room list in sync service: {err:#}");
}
break (true, has_expired);
}
None => {