Merge pull request #8168 from SpiritCroc/chunk-roomids

matrix-sdk: Ensure correct room for events loaded by chunks
element-hq · Mar 2, 2023 · c7928c2 · c7928c2
2 parents 14cbc96 + 8192bb5
commit c7928c2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/changelog.d/8168.bugfix b/changelog.d/8168.bugfix
@@ -0,0 +1 @@
+Fix timeline loading a wrong room on permalink if a matching event id is found in a different room
diff --git a/...droid/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt b/...droid/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
@@ -297,7 +297,7 @@ internal fun updateThreadNotifications(roomId: String, realm: Realm, currentUser
     val readReceipt = findMyReadReceipt(realm, roomId, currentUserId, threadId = rootThreadEventId) ?: return
 
     val readReceiptChunk = ChunkEntity
-            .findIncludingEvent(realm, readReceipt) ?: return
+            .findIncludingEvent(realm, roomId, readReceipt) ?: return
 
     val readReceiptChunkThreadEvents = readReceiptChunk
             .timelineEvents

diff --git a/...ndroid/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt b/...ndroid/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
@@ -72,15 +72,16 @@ internal fun ChunkEntity.Companion.findEventInThreadChunk(realm: Realm, roomId:
             .findFirst()
 }
 
-internal fun ChunkEntity.Companion.findAllIncludingEvents(realm: Realm, eventIds: List<String>): RealmResults<ChunkEntity> {
+internal fun ChunkEntity.Companion.findAllIncludingEvents(realm: Realm, roomId: String, eventIds: List<String>): RealmResults<ChunkEntity> {
     return realm.where<ChunkEntity>()
+            .equalTo(ChunkEntityFields.ROOM.ROOM_ID, roomId)
             .`in`(ChunkEntityFields.TIMELINE_EVENTS.EVENT_ID, eventIds.toTypedArray())
             .isNull(ChunkEntityFields.ROOT_THREAD_EVENT_ID)
             .findAll()
 }
 
-internal fun ChunkEntity.Companion.findIncludingEvent(realm: Realm, eventId: String): ChunkEntity? {
-    return findAllIncludingEvents(realm, listOf(eventId)).firstOrNull()
+internal fun ChunkEntity.Companion.findIncludingEvent(realm: Realm, roomId: String, eventId: String): ChunkEntity? {
+    return findAllIncludingEvents(realm, roomId, listOf(eventId)).firstOrNull()
 }
 
 internal fun ChunkEntity.Companion.create(

diff --git a/...x-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt b/...x-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
@@ -76,11 +76,11 @@ private fun hasReadMissingEvent(realm: Realm,
                                 userId: String,
                                 eventId: String,
                                 threadId: String? = ReadService.THREAD_ID_MAIN): Boolean {
-    return realm.doesEventExistInChunkHistory(eventId) && realm.hasReadReceiptInLatestChunk(latestChunkEntity, roomId, userId, threadId)
+    return realm.doesEventExistInChunkHistory(roomId, eventId) && realm.hasReadReceiptInLatestChunk(latestChunkEntity, roomId, userId, threadId)
 }
 
-private fun Realm.doesEventExistInChunkHistory(eventId: String): Boolean {
-    return ChunkEntity.findIncludingEvent(this, eventId) != null
+private fun Realm.doesEventExistInChunkHistory(roomId: String, eventId: String): Boolean {
+    return ChunkEntity.findIncludingEvent(this, roomId, eventId) != null
 }
 
 private fun Realm.hasReadReceiptInLatestChunk(latestChunkEntity: ChunkEntity, roomId: String, userId: String, threadId: String?): Boolean {

diff --git a/...n/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt b/...n/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
@@ -59,7 +59,7 @@ internal class DefaultFetchTokenAndPaginateTask @Inject constructor(
                 ?: throw IllegalStateException("No token found")
 
         monarchy.awaitTransaction { realm ->
-            val chunkToUpdate = ChunkEntity.findIncludingEvent(realm, params.lastKnownEventId)
+            val chunkToUpdate = ChunkEntity.findIncludingEvent(realm, params.roomId, params.lastKnownEventId)
             if (params.direction == PaginationDirection.FORWARDS) {
                 chunkToUpdate?.nextToken = fromToken
             } else {

diff --git a/...c/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt b/...c/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
@@ -278,7 +278,7 @@ internal class LoadTimelineStrategy constructor(
                         .findAll()
             }
             is Mode.Permalink -> {
-                ChunkEntity.findAllIncludingEvents(realm, listOf(mode.originEventId))
+                ChunkEntity.findAllIncludingEvents(realm, roomId, listOf(mode.originEventId))
             }
             is Mode.Thread -> {
                 recreateThreadChunkEntity(realm, mode.rootThreadEventId)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix timeline loading a wrong room on permalink if a matching event id is found in a different room