Rename getAllRooms

core/src/main/java/org/futo/circles/core/extensions/MatrixSessionExtensions.kt

@@ -6,7 +6,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.mapLatest
-import org.futo.circles.core.utils.getAllCirclesRoomsLiveData
+import org.futo.circles.core.utils.getAllRoomsLiveData
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.session.getRoom
@@ -52,7 +52,7 @@ fun Session.getServerDomain() = myUserId.substringAfter(":")
 
 
 fun Session.getKnownUsersFlow() =
-    getAllCirclesRoomsLiveData(listOf(Membership.JOIN)).asFlow().mapLatest { roomSummaries ->
+    getAllRoomsLiveData(listOf(Membership.JOIN)).asFlow().mapLatest { roomSummaries ->
         val knowUsers = mutableSetOf<User>()
         roomSummaries.forEach { summary ->
             val joinedMembersIds = getRoom(summary.roomId)?.membershipService()

core/src/main/java/org/futo/circles/core/feature/notifications/ShortcutsHandler.kt

@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.futo.circles.core.R
-import org.futo.circles.core.utils.getAllCirclesRoomsLiveData
+import org.futo.circles.core.utils.getAllRoomsLiveData
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
@@ -30,7 +30,7 @@ class ShortcutsHandler @Inject constructor(
     fun observeRoomsAndBuildShortcuts(coroutineScope: CoroutineScope): Job {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return Job()
 
-        return getAllCirclesRoomsLiveData(listOf(Membership.JOIN)).asFlow().onEach { rooms ->
+        return getAllRoomsLiveData(listOf(Membership.JOIN)).asFlow().onEach { rooms ->
             removeDeadShortcuts(rooms.map { it.roomId })
             createShortcuts(rooms)
         }

core/src/main/java/org/futo/circles/core/feature/room/invites/InvitesDataSource.kt

@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
-import org.futo.circles.core.extensions.createResult
 import org.futo.circles.core.extensions.getKnownUsersFlow
 import org.futo.circles.core.model.GALLERY_TYPE
 import org.futo.circles.core.model.GROUP_TYPE
@@ -18,8 +17,7 @@ import org.futo.circles.core.model.TIMELINE_TYPE
 import org.futo.circles.core.model.convertToCircleRoomType
 import org.futo.circles.core.model.toRoomInviteListItem
 import org.futo.circles.core.provider.MatrixSessionProvider
-import org.futo.circles.core.utils.getAllCirclesRoomsLiveData
-import org.matrix.android.sdk.api.session.getRoom
+import org.futo.circles.core.utils.getAllRoomsLiveData
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
@@ -31,7 +29,7 @@ class InvitesDataSource @Inject constructor() {
     fun getRoomInvitesFlow(
         inviteType: InviteTypeArg
     ): Flow<List<RoomInviteListItem>> = combine(
-        getAllCirclesRoomsLiveData(listOf(Membership.INVITE)).asFlow(),
+        getAllRoomsLiveData(listOf(Membership.INVITE)).asFlow(),
         MatrixSessionProvider.getSessionOrThrow().getKnownUsersFlow(),
         roomIdsToUnblurProfile
     ) { roomSummaries, knownUsers, roomIdsToUnblur ->

core/src/main/java/org/futo/circles/core/feature/select_users/SearchUserDataSource.kt

@@ -10,7 +10,7 @@ import org.futo.circles.core.extensions.createResult
 import org.futo.circles.core.extensions.getKnownUsersFlow
 import org.futo.circles.core.extensions.getServerDomain
 import org.futo.circles.core.provider.MatrixSessionProvider
-import org.futo.circles.core.utils.getAllCirclesRooms
+import org.futo.circles.core.utils.getAllRooms
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.user.model.User
 import javax.inject.Inject
@@ -20,7 +20,7 @@ class SearchUserDataSource @Inject constructor() {
     private val session = MatrixSessionProvider.currentSession
 
     suspend fun loadAllRoomMembersIfNeeded() {
-        getAllCirclesRooms().forEach {
+        getAllRooms().forEach {
             session?.getRoom(it.roomId)?.membershipService()?.loadRoomMembersIfNeeded()
         }
     }

core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt

@@ -78,11 +78,11 @@ private fun getAllRoomsFiler(membershipFilter: List<Membership>) = roomSummaryQu
     memberships = membershipFilter
 }
 
-fun getAllCirclesRoomsLiveData(membershipFilter: List<Membership> = Membership.activeMemberships()) =
+fun getAllRoomsLiveData(membershipFilter: List<Membership> = Membership.activeMemberships()) =
     MatrixSessionProvider.getSessionOrThrow().roomService()
         .getRoomSummariesLive(getAllRoomsFiler(membershipFilter))
 
-fun getAllCirclesRooms(membershipFilter: List<Membership> = Membership.activeMemberships()) =
+fun getAllRooms(membershipFilter: List<Membership> = Membership.activeMemberships()) =
     MatrixSessionProvider.getSessionOrThrow().roomService()
         .getRoomSummaries(getAllRoomsFiler(membershipFilter))