Merge pull request #5722 from element-hq/feature/bma/moduleCleanup

Module cleanup

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mxc/DefaultMxcTools.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.mxc
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.matrix.api.mxc.MxcTools
+
+@ContributesBinding(AppScope::class)
+class DefaultMxcTools : MxcTools {
+    /**
+     * Regex to match a Matrix Content (mxc://) URI.
+     *
+     * See: https://spec.matrix.org/v1.8/client-server-api/#matrix-content-mxc-uris
+     */
+    private val mxcRegex = Regex("""^mxc://([^/]+)/([^/]+)$""")
+
+    /**
+     * Sanitizes an mxcUri to be used as a relative file path.
+     *
+     * @param mxcUri the Matrix Content (mxc://) URI of the file.
+     * @return the relative file path as "<server-name>/<media-id>" or null if the mxcUri is invalid.
+     */
+    override fun mxcUri2FilePath(mxcUri: String): String? = mxcRegex.matchEntire(mxcUri)?.let { match ->
+        buildString {
+            append(match.groupValues[1])
+            append("/")
+            append(match.groupValues[2])
+        }
+    }
+}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mxc/DefaultMxcToolsTest.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-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.
+ */
+
+package io.element.android.libraries.matrix.impl.mxc
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class DefaultMxcToolsTest {
+    @Test
+    fun `mxcUri2FilePath returns extracted path`() {
+        val mxcTools = DefaultMxcTools()
+        val mxcUri = "mxc://server.org/abc123"
+        val filePath = mxcTools.mxcUri2FilePath(mxcUri)
+        assertThat(filePath).isEqualTo("server.org/abc123")
+    }
+
+    @Test
+    fun `mxcUri2FilePath returns null for invalid data`() {
+        val mxcTools = DefaultMxcTools()
+        assertThat(mxcTools.mxcUri2FilePath("")).isNull()
+        assertThat(mxcTools.mxcUri2FilePath("mxc://server.org")).isNull()
+        assertThat(mxcTools.mxcUri2FilePath("mxc://server.org/")).isNull()
+        assertThat(mxcTools.mxcUri2FilePath("m://server.org/abc123")).isNull()
+    }
+}