From 47493fcfa135ab6464fda974a45d9bd164ee5222 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 2 May 2022 14:11:17 +0200
Subject: [PATCH] Replaces method for getting the space parents of rooms

---
 .../session/room/summary/RoomSummaryDataSource.kt   | 13 +++++++++++++
 .../session/room/summary/RoomSummaryUpdater.kt      |  8 --------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 18a4f80547..a84f9aa7d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -37,6 +37,7 @@ import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.SpaceParentInfo
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.spaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
@@ -197,6 +198,18 @@ internal class RoomSummaryDataSource @Inject constructor(
         }
         val dataSourceFactory = realmDataSourceFactory.map {
             roomSummaryMapper.map(it)
+        }.map { roomSummary ->
+            val parents = roomSummary.flattenParentIds.mapNotNull { parentId ->
+                getRoomSummary(parentId)?.let { parentSummary ->
+                    SpaceParentInfo(
+                            parentId = parentSummary.flattenParentIds.firstOrNull(),
+                            roomSummary = parentSummary,
+                            canonical = true,
+                            viaServers = emptyList()
+                    )
+                }
+            }
+            roomSummary.copy(spaceParents = parents)
         }
 
         val boundaries = MutableLiveData(ResultBoundaries())
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 81979c6926..4a9f6c44c9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.room.summary
 
 import io.realm.Realm
-import io.realm.RealmList
 import io.realm.kotlin.createObject
 import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.extensions.orFalse
@@ -362,13 +361,6 @@ internal class RoomSummaryUpdater @Inject constructor(
                             val flattenParentsIds = (flattenSpaceParents[parent.roomId] ?: emptyList()) + listOf(parent.roomId)
                             entry.value.forEach { child ->
                                 RoomSummaryEntity.where(realm, child.roomId).findFirst()?.let { childSum ->
-                                    // TODO: Revisit
-                                    childSum.parents.add(SpaceParentSummaryEntity(
-                                            canonical = true,
-                                            parentRoomId = parent.roomId,
-                                            parentSummaryEntity = parent,
-                                            viaServers = RealmList()
-                                    ))
                                     if (childSum.flattenParentIds == null) childSum.flattenParentIds = ""
                                     flattenParentsIds.forEach {
                                         if (childSum.flattenParentIds?.contains(it) != true) {