Code cleanup, remove dead code and fix compilation issue

2025-09-10 14:08:10 +02:00
parent df93fa82db
commit d7c6cbc78c
17 changed files with 13 additions and 33 deletions
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt
@@ -8,7 +8,6 @@
 package io.element.android.features.home.impl.spaces

 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.SpaceId
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import kotlinx.collections.immutable.ImmutableSet

--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
@@ -63,7 +63,7 @@ fun HomeSpacesView(
                        onSpaceClick(spaceRoom.roomId)
                    },
                    onLongClick = {
-
+                        // TODO
                    }
                )
            }
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt
@@ -8,10 +8,7 @@
 package io.element.android.features.invite.api

 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.SpaceId
-import io.element.android.libraries.matrix.api.core.toSpaceId
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map

 interface SeenInvitesStore {
    /**
--- a/features/space/api/build.gradle.kts
+++ b/features/space/api/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
--- a/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt
+++ b/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
--- a/features/space/impl/build.gradle.kts
+++ b/features/space/impl/build.gradle.kts
@@ -1,8 +1,7 @@
-import extension.ComponentMergingStrategy
-import extension.setupAnvil
+import extension.setupDependencyInjection

 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
@@ -23,7 +22,7 @@ android {
    }
 }

-setupAnvil(componentMergingStrategy = ComponentMergingStrategy.KSP)
+setupDependencyInjection()

 dependencies {
    implementation(projects.libraries.core)
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt
@@ -10,7 +10,7 @@ package io.element.android.features.space.impl
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt
@@ -24,9 +24,8 @@ class SpaceNode @AssistedInject constructor(
    @Assisted plugins: List<Plugin>,
    presenterFactory: SpacePresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
-
-    val inputs = plugins.filterIsInstance<SpaceEntryPoint.Inputs>().single()
-    val callback = plugins.filterIsInstance<SpaceEntryPoint.Callback>().single()
+    private val inputs = plugins.filterIsInstance<SpaceEntryPoint.Inputs>().single()
+    private val callback = plugins.filterIsInstance<SpaceEntryPoint.Callback>().single()
    private val presenter = presenterFactory.create(inputs)

    @Composable
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpacePresenter.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpacePresenter.kt
@@ -35,7 +35,6 @@ class SpacePresenter(
    private val client: MatrixClient,
    private val seenInvitesStore: SeenInvitesStore,
 ) : Presenter<SpaceState> {
-
    @AssistedFactory
    interface Factory {
        fun create(inputs: SpaceEntryPoint.Inputs): SpacePresenter
@@ -45,11 +44,9 @@ class SpacePresenter(

    @Composable
    override fun present(): SpaceState {
-
        LaunchedEffect(Unit) {
            paginate()
        }
-
        val hideInvitesAvatar by remember {
            client
                .mediaPreviewService()
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt
@@ -105,7 +105,7 @@ private fun SpaceViewContent(
                        onRoomClick(spaceRoom.roomId)
                    },
                    onLongClick = {
-
+                        // TODO
                    }
                )
            }
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt
@@ -20,5 +20,3 @@ value class RoomId(val value: String) : Serializable {

    override fun toString(): String = value
 }
-
-fun RoomId.toSpaceId(): SpaceId = SpaceId(this.value)
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
@@ -22,4 +22,3 @@ interface SpaceRoomList {
    val paginationStatusFlow: StateFlow<PaginationStatus>
    suspend fun paginate(): Result<Unit>
 }
-
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt
@@ -29,7 +29,6 @@ class RustSpaceRoomList(
    spaceRoomMapper: SpaceRoomMapper,
    private val spaceRoomCache: SpaceRoomCache,
 ) : SpaceRoomList {
-
    private val inner = CompletableDeferred<InnerSpaceRoomList>()

    override fun currentSpaceFlow(): Flow<SpaceRoom?> {
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt
@@ -9,7 +9,6 @@ package io.element.android.libraries.matrix.impl.spaces

 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.SpaceId
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.api.spaces.SpaceRoomList
 import io.element.android.libraries.matrix.api.spaces.SpaceService
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt
@@ -44,9 +44,7 @@ internal class SpaceListUpdateProcessor(
    private fun MutableList<SpaceRoom>.applyUpdate(update: SpaceListUpdate) {
        when (update) {
            is SpaceListUpdate.Append -> {
-                val newSpaces = update.values.map { it ->
-                    it.let(mapper::map)
-                }
+                val newSpaces = update.values.map(mapper::map)
                addAll(newSpaces)
            }
            SpaceListUpdate.Clear -> clear()
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomCache.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomCache.kt
@@ -7,9 +7,6 @@

 package io.element.android.libraries.matrix.impl.spaces

-import dev.zacsweers.metro.Inject
-import dev.zacsweers.metro.SingleIn
-import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import kotlinx.coroutines.flow.Flow
@@ -23,7 +20,7 @@ import kotlinx.coroutines.sync.withLock
 * An in memory cache of space rooms.
 * Only caches Rooms with roomType [io.element.android.libraries.matrix.api.room.RoomType.Space].
 */
-class SpaceRoomCache() {
+class SpaceRoomCache {
    private val inMemoryCache = MutableStateFlow<MutableMap<RoomId, SpaceRoom>>(LinkedHashMap())
    private val mutex = Mutex()

--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt
@@ -10,7 +10,6 @@ package io.element.android.libraries.matrix.impl.spaces
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.SpaceId
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.impl.room.join.map
 import io.element.android.libraries.matrix.impl.room.map