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

Merge pull request #2208 from bnjbvr/only-restart-growing-on-errors

Browse Source 
feat: Only restart growing the allRooms list in case of errors
This commit is contained in:
Ivan Enderlin
2023-07-05 10:01:58 +02:00
committed by GitHub
parent da43d81095 e8a306132a
commit a0f40606d4
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/matrix-sdk-ui/src/room_list_service/state.rs
View File

@@ -71,8 +71,14 @@ impl State {
}
Running => {
// Refresh the lists.
(Running, Actions::refresh_lists())
// Refresh the lists only if our sync ran into an error (in particular,
// when the session was invalidated by the server). Otherwise, keep on
// iterating on the previous list.
if matches!(self, Error { .. }) {
(Running, Actions::refresh_lists())
} else {
(Running, Actions::none())
}
}
Error { .. } | Terminated { .. } => {

23
crates/matrix-sdk-ui/tests/integration/room_list_service.rs
View File

@@ -970,9 +970,9 @@ async fn test_sync_resumes_from_terminated() -> Result<(), Error> {
assert request >= {
"lists": {
ALL_ROOMS: {
// In `Running`, the sync-mode is still growing, but the range
// hasn't been modified due to previous termination.
"ranges": [[0, 49]],
// In `Running`, the sync-mode is still growing, the previous termination
// didn't restart the whole growing.
"ranges": [[0, 99]],
},
VISIBLE_ROOMS: {
// We have set a viewport, which reflects here.
@@ -1013,9 +1013,9 @@ async fn test_sync_resumes_from_terminated() -> Result<(), Error> {
assert request >= {
"lists": {
ALL_ROOMS: {
// In `Running`, the sync-mode is still growing, but the range
// hasn't been modified due to the previous termination.
"ranges": [[0, 49]],
// In `Running`, the sync-mode is still growing, the previous termination
// didn't restart the whole growing.
"ranges": [[0, 109]],
},
VISIBLE_ROOMS: {
// Despites the termination, the range is kept.
@@ -1049,8 +1049,8 @@ async fn test_sync_resumes_from_terminated() -> Result<(), Error> {
assert request >= {
"lists": {
ALL_ROOMS: {
// No termination. The range is making progress.
"ranges": [[0, 99]],
// No termination.
"ranges": [[0, 109]],
},
VISIBLE_ROOMS: {
// No termination. The range is still here.
@@ -1088,10 +1088,9 @@ async fn test_sync_resumes_from_terminated() -> Result<(), Error> {
assert request >= {
"lists": {
ALL_ROOMS: {
// A termination was received at the previous sync iteration.
// The list is still in growing sync-mode, but its range has
// been reset.
"ranges": [[0, 49]],
// The termination doesn't invalidate the range, we're still in the stable
// state.
"ranges": [[0, 109]],
},
VISIBLE_ROOMS: {
// The range is still here.