Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make SyncState values match SyncServiceState values.

Browse source
This commit is contained in:
Benoit Marty 2023-07-19 14:44:53 +02:00
parent 2686e5d912
commit 3c9ecec563
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
View file

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

2
appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt
View file

@ -30,7 +30,7 @@ open class LoggedInStateProvider : PreviewParameterProvider<LoggedInState> {
}
fun aLoggedInState(
syncState: SyncState = SyncState.Syncing,
syncState: SyncState = SyncState.Running,
) = LoggedInState(
syncState = syncState,
permissionsState = createDummyPostNotificationPermissionsState(),

4
appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt
View file

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

4
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt
View file

@ -18,7 +18,7 @@ package io.element.android.libraries.matrix.api.sync
enum class SyncState {
Idle,
Syncing,
InError,
Running,
Error,
Terminated,
}

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
View file

@ -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)

8
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt
View file

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

4
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt
View file

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