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

Merge branch 'openqrnch/main'

Browse Source
This commit is contained in:
Damir Jelić
2023-06-19 09:40:14 +02:00
parent 6d4874e147 75cf572968
commit 7c393d73c4
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/matrix-sdk-ui/src/room_list/state.rs
View File

@@ -47,9 +47,10 @@ impl State {
FirstRooms => (AllRooms, Actions::first_rooms_are_loaded()),
AllRooms => (CarryOn, Actions::none()),
CarryOn => (CarryOn, Actions::none()),
// If the state was `Terminated`, the next state is calculated again, because it means the
// sync has been restarted. In this case, let's jump back on the previous state that led
// to the termination. No action is required in this scenario.
// If the state was `Terminated`, the next state is calculated again, because it means
// the sync has been restarted. In this case, let's jump back on the
// previous state that led to the termination. No action is required in this
// scenario.
Terminated { from: previous_state } => {
match previous_state.as_ref() {
state @ Init | state @ FirstRooms => {

12
crates/matrix-sdk/src/client/mod.rs
View File

@@ -2345,12 +2345,12 @@ impl Client {
///
/// * `callback` - A callback that will be called every time after a
/// response has been received, failure or not. The callback returns a
/// `Result<LoopCtrl, Error>, too. When returning `Ok(LoopCtrl::Continue)`
/// the sync will continue, if the callback returns `Ok(LoopCtrl::Break)`
/// the sync will be stopped and the function returns `Ok(())`. In case
/// the callback can't handle the `Error` or has a different malfunction,
/// it can return an `Err(Error)`, which results in the sync ending and
/// the `Err(Error)` being returned.
/// `Result<LoopCtrl, Error>`, too. When returning
/// `Ok(LoopCtrl::Continue)` the sync will continue, if the callback
/// returns `Ok(LoopCtrl::Break)` the sync will be stopped and the
/// function returns `Ok(())`. In case the callback can't handle the
/// `Error` or has a different malfunction, it can return an `Err(Error)`,
/// which results in the sync ending and the `Err(Error)` being returned.
///
/// # Return
/// The sync runs until an error occurs that the callback can't handle or