From eb90268cf5394937b6143d15272dab6551d7fae8 Mon Sep 17 00:00:00 2001 From: David Langley Date: Thu, 10 Feb 2022 10:30:47 +0000 Subject: [PATCH] Updates getAccountDataEvents function to match it's description. --- changelog.d/5198.buxfix | 1 + .../session/room/accountdata/RoomAccountDataDataSource.kt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 changelog.d/5198.buxfix diff --git a/changelog.d/5198.buxfix b/changelog.d/5198.buxfix new file mode 100644 index 0000000000..3fce6906d5 --- /dev/null +++ b/changelog.d/5198.buxfix @@ -0,0 +1 @@ +Fix for rooms with virtual rooms not showing call status events in the timeline. \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt index d96beed3f1..d5a110dfc2 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt @@ -54,8 +54,7 @@ internal class RoomAccountDataDataSource @Inject constructor(@SessionDatabase pr */ fun getAccountDataEvents(roomId: String?, types: Set): List { return realmSessionProvider.withRealm { realm -> - val roomEntity = buildRoomQuery(realm, roomId, types).findFirst() ?: return@withRealm emptyList() - roomEntity.accountDataEvents(types) + buildRoomQuery(realm, roomId, types).findAll().flatMap { it.accountDataEvents(types) } } }