-
Notifications
You must be signed in to change notification settings - Fork 741
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.
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
Rooms with virtual rooms do not render the merged timeline with call events. #5199
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the fix makes sense to me, will defer to @ganfra
Matrix SDKIntegration Tests Results:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
@@ -54,8 +54,7 @@ internal class RoomAccountDataDataSource @Inject constructor(@SessionDatabase pr | |||
*/ | |||
fun getAccountDataEvents(roomId: String?, types: Set<String>): List<RoomAccountDataEvent> { | |||
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) } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FTR the fun getAccountDataEvents
was not used, so we did no see the bug before. Good catch!
Updates getAccountDataEvents function to match its description.
Fixes #5198