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.

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

Merged
merged 1 commit into from
Feb 10, 2022

Conversation

langleyd
Copy link
Member

Updates getAccountDataEvents function to match its description.

Fixes #5198

@github-actions
Copy link

Unit Test Results

  76 files  ±0    76 suites  ±0   58s ⏱️ -1s
144 tests ±0  144 ✔️ ±0  0 💤 ±0  0 ±0 
452 runs  ±0  452 ✔️ ±0  0 💤 ±0  0 ±0 

Results for commit eb90268. ± Comparison against base commit 06b5563.

@ouchadam ouchadam requested a review from ganfra February 10, 2022 11:25
Copy link
Contributor

@ouchadam ouchadam left a 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

@github-actions
Copy link

Matrix SDK

Integration Tests Results:

  • [org.matrix.android.sdk.session]
    passed="25" failures="17" errors="0" skipped="2"
  • [org.matrix.android.sdk.account]
    passed="5" failures="0" errors="0" skipped="2"
  • [org.matrix.android.sdk.internal]
    passed="158" failures="12" errors="0" skipped="38"
  • [org.matrix.android.sdk.ordering]
    passed="1" failures="1" errors="0" skipped="0"
  • [org.matrix.android.sdk.PermalinkParserTest]
    passed="1" failures="1" errors="0" skipped="0"

Copy link
Member

@ganfra ganfra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@ganfra ganfra merged commit f08b10b into develop Feb 10, 2022
@ganfra ganfra deleted the feature/dla/fix_timeline_from_virtual_rooms branch February 10, 2022 18:20
@@ -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) }
Copy link
Member

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!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rooms with virtual rooms do not render the merged timeline with call events.
4 participants