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

Only show HasUnread -> HasUnread updates for same readMarker

This commit is contained in:
SpiritCroc 2022-03-21 11:23:03 +01:00
parent 884ae1cedd
commit 47dddd706c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
View File

@ -36,7 +36,7 @@ sealed class UnreadState {
object Unknown : UnreadState() object Unknown : UnreadState()
object HasNoUnread : UnreadState() object HasNoUnread : UnreadState()
data class ReadMarkerNotLoaded(val readMarkerId: String) : UnreadState() data class ReadMarkerNotLoaded(val readMarkerId: String) : UnreadState()
data class HasUnread(val firstUnreadEventId: String) : UnreadState() data class HasUnread(val firstUnreadEventId: String, val readMarkerId: String) : UnreadState()
} }
data class JitsiState( data class JitsiState(

8
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
View File

@ -1099,11 +1099,13 @@ class TimelineViewModel @AssistedInject constructor(
computeUnreadState(timelineEvents, roomSummary) computeUnreadState(timelineEvents, roomSummary)
} }
// We don't want live update of unread so we skip when we already had a HasUnread or HasNoUnread // We don't want live update of unread so we skip when we already had a HasUnread or HasNoUnread
// However, we want to update an existing HasUnread, as we might get additional information during loading of events. // However, we want to update an existing HasUnread, if the readMarkerId hasn't changed,
// as we might be loading new events to fill gaps in the timeline.
.distinctUntilChanged { previous, current -> .distinctUntilChanged { previous, current ->
when { when {
previous is UnreadState.Unknown || previous is UnreadState.ReadMarkerNotLoaded -> false previous is UnreadState.Unknown || previous is UnreadState.ReadMarkerNotLoaded -> false
previous is UnreadState.HasUnread && current is UnreadState.HasUnread -> false previous is UnreadState.HasUnread && current is UnreadState.HasUnread &&
previous.readMarkerId == current.readMarkerId -> false
current is UnreadState.HasUnread || current is UnreadState.HasNoUnread -> true current is UnreadState.HasUnread || current is UnreadState.HasNoUnread -> true
else -> false else -> false
} }
@ -1132,7 +1134,7 @@ class TimelineViewModel @AssistedInject constructor(
val eventId = timelineEvent.root.eventId ?: return UnreadState.Unknown val eventId = timelineEvent.root.eventId ?: return UnreadState.Unknown
val isFromMe = timelineEvent.root.senderId == session.myUserId val isFromMe = timelineEvent.root.senderId == session.myUserId
if (!isFromMe) { if (!isFromMe) {
return UnreadState.HasUnread(eventId) return UnreadState.HasUnread(eventId, readMarkerIdSnapshot)
} }
} }
return UnreadState.HasNoUnread return UnreadState.HasNoUnread