filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add error state

This commit is contained in:
Benoit Marty 2021-09-17 18:20:28 +02:00 committed by Benoit Marty
parent f5151463e2
commit 05aff3314d
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
View File

@ -36,6 +36,7 @@ interface InitialSyncProgressService {
val rooms: Int,
val toDevice: Int
) : IncrementalSyncStatus()
object IncrementalSyncError : IncrementalSyncStatus()
object IncrementalSyncDone : IncrementalSyncStatus()
}
}

15
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
View File

@ -131,11 +131,16 @@ internal class DefaultSyncTask @Inject constructor(
initialSyncProgressService.endAll()
} else {
initialSyncProgressService.setStatus(InitialSyncProgressService.Status.IncrementalSyncIdle)
val syncResponse = executeRequest(globalErrorReceiver) {
syncAPI.sync(
params = requestParams,
readTimeOut = readTimeOut
)
val syncResponse = try {
executeRequest(globalErrorReceiver) {
syncAPI.sync(
params = requestParams,
readTimeOut = readTimeOut
)
}
} catch (throwable: Throwable) {
initialSyncProgressService.setStatus(InitialSyncProgressService.Status.IncrementalSyncError)
throw throwable
}
initialSyncProgressService.setStatus(InitialSyncProgressService.Status.IncrementalSyncParsing(
rooms = syncResponse.rooms?.invite.orEmpty().size + syncResponse.rooms?.join.orEmpty().size + syncResponse.rooms?.leave.orEmpty().size,

1
vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
View File

@ -75,6 +75,7 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute
return when (this) {
InitialSyncProgressService.Status.IncrementalSyncIdle -> "Idle"
is InitialSyncProgressService.Status.IncrementalSyncParsing -> "Parsing ${this.rooms} room(s) ${this.toDevice} toDevice(s)"
InitialSyncProgressService.Status.IncrementalSyncError -> "Error"
InitialSyncProgressService.Status.IncrementalSyncDone -> "Done"
else -> "?"
}