filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the number of rooms and toDevice events in the debug data

Browse Source
This commit is contained in:
Benoit Marty 2021-09-17 18:02:49 +02:00 committed by Benoit Marty
parent 63a84dcb8a
commit f5151463e2
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,10 @@ interface InitialSyncProgressService {
abstract class IncrementalSyncStatus: Status() abstract class IncrementalSyncStatus: Status()
object IncrementalSyncIdle : IncrementalSyncStatus() object IncrementalSyncIdle : IncrementalSyncStatus()
object IncrementalSyncParsing : IncrementalSyncStatus() data class IncrementalSyncParsing(
val rooms: Int,
val toDevice: Int
) : IncrementalSyncStatus()
object IncrementalSyncDone : IncrementalSyncStatus() object IncrementalSyncDone : IncrementalSyncStatus()
} }
} }

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

@ -137,7 +137,10 @@ internal class DefaultSyncTask @Inject constructor(
readTimeOut = readTimeOut readTimeOut = readTimeOut
) )
} }
initialSyncProgressService.setStatus(InitialSyncProgressService.Status.IncrementalSyncParsing) initialSyncProgressService.setStatus(InitialSyncProgressService.Status.IncrementalSyncParsing(
rooms = syncResponse.rooms?.invite.orEmpty().size + syncResponse.rooms?.join.orEmpty().size + syncResponse.rooms?.leave.orEmpty().size,
toDevice = syncResponse.toDevice?.events.orEmpty().size
))
syncResponseHandler.handleResponse(syncResponse, token, null) syncResponseHandler.handleResponse(syncResponse, token, null)
initialSyncProgressService.setStatus(InitialSyncProgressService.Status.IncrementalSyncDone) initialSyncProgressService.setStatus(InitialSyncProgressService.Status.IncrementalSyncDone)
} }

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

@ -73,9 +73,9 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute
private fun InitialSyncProgressService.Status.IncrementalSyncStatus.toHumanReadable(): String { private fun InitialSyncProgressService.Status.IncrementalSyncStatus.toHumanReadable(): String {
return when (this) { return when (this) {
is InitialSyncProgressService.Status.IncrementalSyncIdle -> "Idle" InitialSyncProgressService.Status.IncrementalSyncIdle -> "Idle"
is InitialSyncProgressService.Status.IncrementalSyncParsing -> "Parsing" is InitialSyncProgressService.Status.IncrementalSyncParsing -> "Parsing ${this.rooms} room(s) ${this.toDevice} toDevice(s)"
is InitialSyncProgressService.Status.IncrementalSyncDone -> "Done" InitialSyncProgressService.Status.IncrementalSyncDone -> "Done"
else -> "?" else -> "?"
} }
} }

2
vector/src/main/res/layout/view_sync_state.xml
View File

@ -9,9 +9,11 @@
<TextView <TextView
android:id="@+id/syncStateDebugInfo" android:id="@+id/syncStateDebugInfo"
style="@style/Widget.Vector.TextView.Caption"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="monospace" android:fontFamily="monospace"
android:padding="2dp"
android:visibility="gone" android:visibility="gone"
tools:text="debug info" tools:text="debug info"
tools:visibility="visible" /> tools:visibility="visible" />