From c04fcfc3524fa5587babeae2dad5a53014760967 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 19 Jul 2023 14:44:53 +0200 Subject: [PATCH] Make `SyncState` values match `SyncServiceState` values. --- .../kotlin/io/element/android/appnav/LoggedInFlowNode.kt | 2 +- .../android/appnav/loggedin/LoggedInStateProvider.kt | 2 +- .../io/element/android/appnav/loggedin/SyncStateView.kt | 4 ++-- .../android/libraries/matrix/api/sync/SyncState.kt | 4 ++-- .../android/libraries/matrix/impl/RustMatrixClient.kt | 2 +- .../android/libraries/matrix/impl/sync/AppStateMapper.kt | 8 ++++---- .../android/libraries/matrix/test/sync/FakeSyncService.kt | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt index 2a11c00fcd..4130e5da23 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt @@ -164,7 +164,7 @@ class LoggedInFlowNode @AssistedInject constructor( syncService.syncState, networkMonitor.connectivity ) { syncState, networkStatus -> - syncState == SyncState.InError && networkStatus == NetworkStatus.Online + syncState == SyncState.Error && networkStatus == NetworkStatus.Online } .distinctUntilChanged() .collect { restartSync -> diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt index 533cc15e03..e8a8a4762c 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt @@ -30,7 +30,7 @@ open class LoggedInStateProvider : PreviewParameterProvider { } fun aLoggedInState( - syncState: SyncState = SyncState.Syncing, + syncState: SyncState = SyncState.Running, ) = LoggedInState( syncState = syncState, permissionsState = createDummyPostNotificationPermissionsState(), diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt index 0c147fe457..c045296a8a 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt @@ -84,8 +84,8 @@ fun SyncStateView( private fun SyncState.mustBeVisible() = when (this) { SyncState.Idle -> true - SyncState.Syncing -> false - SyncState.InError -> false /* In this case, the network error banner can be displayed */ + SyncState.Running -> false + SyncState.Error -> false /* In this case, the network error banner can be displayed */ SyncState.Terminated -> false } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt index 596c131420..9df542be73 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt @@ -18,7 +18,7 @@ package io.element.android.libraries.matrix.api.sync enum class SyncState { Idle, - Syncing, - InError, + Running, + Error, Terminated, } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt index 52c8923919..640e0772a9 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt @@ -144,7 +144,7 @@ class RustMatrixClient constructor( client.setDelegate(clientDelegate) rustSyncService.syncState .onEach { syncState -> - if (syncState == SyncState.Syncing) { + if (syncState == SyncState.Running) { onSlidingSyncUpdate() } }.launchIn(sessionCoroutineScope) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt index 734041486a..51228231f9 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt @@ -24,8 +24,8 @@ internal fun RoomListServiceState.toSyncState(): SyncState { return when (this) { RoomListServiceState.INIT, RoomListServiceState.SETTING_UP -> SyncState.Idle - RoomListServiceState.RUNNING -> SyncState.Syncing - RoomListServiceState.ERROR -> SyncState.InError + RoomListServiceState.RUNNING -> SyncState.Running + RoomListServiceState.ERROR -> SyncState.Error RoomListServiceState.TERMINATED -> SyncState.Terminated } } @@ -33,8 +33,8 @@ internal fun RoomListServiceState.toSyncState(): SyncState { internal fun SyncServiceState.toSyncState(): SyncState { return when (this) { SyncServiceState.IDLE -> SyncState.Idle - SyncServiceState.RUNNING -> SyncState.Syncing + SyncServiceState.RUNNING -> SyncState.Running SyncServiceState.TERMINATED -> SyncState.Terminated - SyncServiceState.ERROR -> SyncState.InError + SyncServiceState.ERROR -> SyncState.Error } } diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt index 5405d3a28a..dd653a76ec 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt @@ -26,11 +26,11 @@ class FakeSyncService : SyncService { private val syncStateFlow = MutableStateFlow(SyncState.Idle) fun simulateError() { - syncStateFlow.value = SyncState.InError + syncStateFlow.value = SyncState.Error } override suspend fun startSync(): Result { - syncStateFlow.value = SyncState.Syncing + syncStateFlow.value = SyncState.Running return Result.success(Unit) }