From 8303198ef21c03cc2eea01fe8baef23aac5500e9 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Tue, 26 Sep 2023 17:48:54 +0300
Subject: [PATCH] Move get timeline room to roomUtils
---
.../core/extensions/MatrixRoomExtensions.kt | 15 ---------------
.../java/org/futo/circles/core/utils/RoomUtils.kt | 11 ++++++++++-
2 files changed, 10 insertions(+), 16 deletions(-)
delete mode 100644 core/src/main/java/org/futo/circles/core/extensions/MatrixRoomExtensions.kt
diff --git a/core/src/main/java/org/futo/circles/core/extensions/MatrixRoomExtensions.kt b/core/src/main/java/org/futo/circles/core/extensions/MatrixRoomExtensions.kt
deleted file mode 100644
index 32fe60b2b..000000000
--- a/core/src/main/java/org/futo/circles/core/extensions/MatrixRoomExtensions.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.futo.circles.core.extensions
-
-import org.futo.circles.core.model.TIMELINE_TYPE
-import org.futo.circles.core.provider.MatrixSessionProvider
-import org.matrix.android.sdk.api.session.getRoom
-import org.matrix.android.sdk.api.session.room.Room
-
-fun Room.getTimelineRoom(): Room? {
- val session = MatrixSessionProvider.currentSession ?: return null
- val childId = roomSummary()?.spaceChildren?.firstOrNull {
- val room = session.getRoom(it.childRoomId)?.roomSummary()
- room?.inviterId == null && room?.roomType == TIMELINE_TYPE
- }?.childRoomId
- return childId?.let { session.getRoom(it) }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/futo/circles/core/utils/RoomUtils.kt b/core/src/main/java/org/futo/circles/core/utils/RoomUtils.kt
index f85312379..2a9f0e7e5 100644
--- a/core/src/main/java/org/futo/circles/core/utils/RoomUtils.kt
+++ b/core/src/main/java/org/futo/circles/core/utils/RoomUtils.kt
@@ -1,7 +1,7 @@
package org.futo.circles.core.utils
import org.futo.circles.core.SYSTEM_NOTICES_TAG
-import org.futo.circles.core.extensions.getTimelineRoom
+import org.futo.circles.core.model.TIMELINE_TYPE
import org.futo.circles.core.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
import org.matrix.android.sdk.api.session.room.Room
@@ -9,6 +9,15 @@ import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.model.RoomType
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+fun Room.getTimelineRoom(): Room? {
+ val session = MatrixSessionProvider.currentSession ?: return null
+ val childId = roomSummary()?.spaceChildren?.firstOrNull {
+ val room = session.getRoom(it.childRoomId)?.roomSummary()
+ room?.inviterId == null && room?.roomType == TIMELINE_TYPE
+ }?.childRoomId
+ return childId?.let { session.getRoom(it) }
+}
+
fun getTimelineRoomFor(circleId: String): Room? {
val session = MatrixSessionProvider.currentSession ?: return null
return session.getRoom(circleId)?.getTimelineRoom()
--
GitLab