Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix updating unread marker if not to latest chunk #5481

Merged
merged 3 commits into from
Apr 7, 2022
Merged

Fix updating unread marker if not to latest chunk #5481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c4e404
Fix updating unread marker if not to latest chunk
SpiritCroc Mar 9, 2022
0564942
isReadMarkerMoreRecent(): use helper to properly compare chunks
SpiritCroc Mar 10, 2022
6ba0262
Fix ChunkEntity.isMoreRecentThan() if both chunks linked to last forward
SpiritCroc Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5481.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix sometimes read marker not properly updating
3 changes: 3 additions & 0 deletions ...ndroid/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ internal fun ChunkEntity.isMoreRecentThan(chunkToCheck: ChunkEntity): Boolean {
if (chunkToCheck.doesNextChunksVerifyCondition { it == this }) {
return true
}
if (this.doesNextChunksVerifyCondition { it == chunkToCheck }) {
return false
}
// Otherwise check if this chunk is linked to last forward
if (this.doesNextChunksVerifyCondition { it.isLastForward }) {
return true
Expand Down
2 changes: 1 addition & 1 deletion ...x-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ internal fun isReadMarkerMoreRecent(realmConfiguration: RealmConfiguration,
val eventToCheckIndex = eventToCheck?.displayIndex ?: Int.MAX_VALUE
eventToCheckIndex <= readMarkerIndex
} else {
eventToCheckChunk?.isLastForward == false
eventToCheckChunk != null && readMarkerChunk?.isMoreRecentThan(eventToCheckChunk) == true
}
}
}