Split module deeplink to api and impl.

libraries/deeplink/api/build.gradle.kts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2022-2024 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.deeplink.api"
+}
+
+dependencies {
+    implementation(projects.libraries.matrix.api)
+}

libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeepLinkCreator.kt

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2023, 2024 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.deeplink.api
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.ThreadId
+
+fun interface DeepLinkCreator {
+    fun room(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): String
+}

libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkData.kt

@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.deeplink
+package io.element.android.libraries.deeplink.api
 
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId

libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkParser.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2023, 2024 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.deeplink.api
+
+import android.content.Intent
+
+fun interface DeeplinkParser {
+    fun getFromIntent(intent: Intent): DeeplinkData?
+}

libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/usecase/InviteFriendsUseCase.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2023, 2024 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.deeplink.api.usecase
+
+import android.app.Activity
+
+interface InviteFriendsUseCase {
+    fun execute(activity: Activity)
+}

libraries/deeplink/impl/build.gradle.kts

@@ -6,17 +6,19 @@ import extension.setupAnvil
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE files in the repository root for full details.
  */
+
 plugins {
     id("io.element.android-library")
 }
 
 android {
-    namespace = "io.element.android.libraries.deeplink"
+    namespace = "io.element.android.libraries.deeplink.impl"
 }
 
 setupAnvil()
 
 dependencies {
+    api(projects.libraries.deeplink.api)
     implementation(projects.libraries.di)
     implementation(libs.dagger)
     implementation(libs.androidx.corektx)

libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/Constants.kt

@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.deeplink
+package io.element.android.libraries.deeplink.impl
 
 internal const val SCHEME = "elementx"
 internal const val HOST = "open"

libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreator.kt

@@ -1,19 +1,23 @@
 /*
- * 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.
  */
 
-package io.element.android.libraries.deeplink
+package io.element.android.libraries.deeplink.impl
 
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.libraries.deeplink.api.DeepLinkCreator
+import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import javax.inject.Inject
 
-class DeepLinkCreator @Inject constructor() {
-    fun room(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): String {
+@ContributesBinding(AppScope::class)
+class DefaultDeepLinkCreator @Inject constructor() : DeepLinkCreator {
+    override fun room(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): String {
         return buildString {
             append("$SCHEME://$HOST/")
             append(sessionId.value)

libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParser.kt

@@ -1,21 +1,26 @@
 /*
- * 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.
  */
 
-package io.element.android.libraries.deeplink
+package io.element.android.libraries.deeplink.impl
 
 import android.content.Intent
 import android.net.Uri
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.libraries.deeplink.api.DeeplinkData
+import io.element.android.libraries.deeplink.api.DeeplinkParser
+import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import javax.inject.Inject
 
-class DeeplinkParser @Inject constructor() {
-    fun getFromIntent(intent: Intent): DeeplinkData? {
+@ContributesBinding(AppScope::class)
+class DefaultDeeplinkParser @Inject constructor() : DeeplinkParser {
+    override fun getFromIntent(intent: Intent): DeeplinkData? {
         return intent
             .takeIf { it.action == Intent.ACTION_VIEW }
             ?.data

libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/usecase/DefaultInviteFriendsUseCase.kt

@@ -1,15 +1,18 @@
 /*
- * 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.
  */
 
-package io.element.android.libraries.deeplink.usecase
+package io.element.android.libraries.deeplink.impl.usecase
 
 import android.app.Activity
+import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.androidutils.system.startSharePlainTextIntent
 import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.deeplink.api.usecase.InviteFriendsUseCase
+import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -18,13 +21,14 @@ import timber.log.Timber
 import javax.inject.Inject
 import io.element.android.libraries.androidutils.R as AndroidUtilsR
 
-class InviteFriendsUseCase @Inject constructor(
+@ContributesBinding(SessionScope::class)
+class DefaultInviteFriendsUseCase @Inject constructor(
     private val stringProvider: StringProvider,
     private val matrixClient: MatrixClient,
     private val buildMeta: BuildMeta,
     private val permalinkBuilder: PermalinkBuilder,
-) {
-    fun execute(activity: Activity) {
+) : InviteFriendsUseCase {
+    override fun execute(activity: Activity) {
         val permalinkResult = permalinkBuilder.permalinkForUser(matrixClient.sessionId)
         permalinkResult.fold(
             onSuccess = { permalink ->

libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt

@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.deeplink
+package io.element.android.libraries.deeplink.impl
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -13,10 +13,10 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
 import org.junit.Test
 
-class DeepLinkCreatorTest {
+class DefaultDeepLinkCreatorTest {
     @Test
     fun room() {
-        val sut = DeepLinkCreator()
+        val sut = DefaultDeepLinkCreator()
         assertThat(sut.room(A_SESSION_ID, null, null))
             .isEqualTo("elementx://open/@alice:server.org")
         assertThat(sut.room(A_SESSION_ID, A_ROOM_ID, null))

libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParserTest.kt

@@ -5,11 +5,12 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.deeplink
+package io.element.android.libraries.deeplink.impl
 
 import android.content.Intent
 import androidx.core.net.toUri
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.deeplink.api.DeeplinkData
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
@@ -19,7 +20,7 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
-class DeeplinkParserTest {
+class DefaultDeeplinkParserTest {
     companion object {
         const val A_URI =
             "elementx://open/@alice:server.org"
@@ -29,10 +30,9 @@ class DeeplinkParserTest {
             "elementx://open/@alice:server.org/!aRoomId:domain/\$aThreadId"
     }
 
-    private val sut = DeeplinkParser()
-
     @Test
     fun `nominal cases`() {
+        val sut = DefaultDeeplinkParser()
         assertThat(sut.getFromIntent(createIntent(A_URI)))
             .isEqualTo(DeeplinkData.Root(A_SESSION_ID))
         assertThat(sut.getFromIntent(createIntent(A_URI_WITH_ROOM)))
@@ -43,7 +43,7 @@ class DeeplinkParserTest {
 
     @Test
     fun `error cases`() {
-        val sut = DeeplinkParser()
+        val sut = DefaultDeeplinkParser()
         // Bad scheme
         assertThat(sut.getFromIntent(createIntent("x://open/@alice:server.org"))).isNull()
         // Bad host