Merge pull request #920 from vector-im/feature/bma/slidingSyncState

Sliding sync state rendering

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,
 }

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)

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
     }
 }

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<Unit> {
-        syncStateFlow.value = SyncState.Syncing
+        syncStateFlow.value = SyncState.Running
         return Result.success(Unit)
     }