From 6edb9acc2bc3dcc370abbe8ef6a7dc71cecdac51 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 30 Sep 2025 17:09:45 +0200
Subject: [PATCH] Let SpaceId be an alias of RoomId

---
 .../matrix/api/core/MatrixPatterns.kt          |  8 --------
 .../libraries/matrix/api/core/SpaceId.kt       | 18 +-----------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt
index 26a030d361..c833d46718 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt
@@ -69,14 +69,6 @@ object MatrixPatterns {
             str matches PATTERN_CONTAIN_MATRIX_USER_IDENTIFIER
     }
 
-    /**
-     * Tells if a string is a valid space id. This is an alias for [isRoomId]
-     *
-     * @param str the string to test
-     * @return true if the string is a valid space Id
-     */
-    fun isSpaceId(str: String?) = isRoomId(str)
-
     /**
      * Tells if a string is a valid room id.
      *
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SpaceId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SpaceId.kt
index 74074ed8e4..6db907bacd 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SpaceId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SpaceId.kt
@@ -7,23 +7,7 @@
 
 package io.element.android.libraries.matrix.api.core
 
-import io.element.android.libraries.androidutils.metadata.isInDebug
-import java.io.Serializable
-
-@JvmInline
-value class SpaceId(val value: String) : Serializable {
-    init {
-        if (isInDebug && !MatrixPatterns.isSpaceId(value)) {
-            error(
-                "`$value` is not a valid space id.\n" +
-                    "Space ids are the same as room ids.\n" +
-                    "Example space id: `!space_id:domain`."
-            )
-        }
-    }
-
-    override fun toString(): String = value
-}
+typealias SpaceId = RoomId
 
 /**
  * Value to use when no space is selected by the user.