Merge branch 'develop' into feature/fga/improve_node_architecture

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -46,8 +46,8 @@ import io.element.android.libraries.architecture.nodeInputs
 import io.element.android.libraries.architecture.nodeInputsProvider
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.matrix.MatrixClient
-import io.element.android.libraries.matrix.core.RoomId
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.di.MatrixUIBindings
 import kotlinx.parcelize.Parcelize
 

appnav/src/main/kotlin/io/element/android/appnav/MatrixClientsHolder.kt

@@ -19,9 +19,10 @@ package io.element.android.appnav
 import android.os.Bundle
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.matrix.MatrixClient
-import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
-import io.element.android.libraries.matrix.core.SessionId
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 import java.util.concurrent.ConcurrentHashMap
@@ -57,13 +58,13 @@ class MatrixClientsHolder @Inject constructor(private val authenticationService:
     @Suppress("DEPRECATION")
     fun restore(savedInstanceState: Bundle?) {
         if (savedInstanceState == null || sessionIdsToMatrixClient.isNotEmpty()) return
-        val sessionIds = savedInstanceState.getSerializable(SAVE_INSTANCE_KEY) as? Array<SessionId>
-        if (sessionIds.isNullOrEmpty()) return
+        val userIds = savedInstanceState.getSerializable(SAVE_INSTANCE_KEY) as? Array<UserId>
+        if (userIds.isNullOrEmpty()) return
         // Not ideal but should only happens in case of process recreation. This ensure we restore all the active sessions before restoring the node graphs.
         runBlocking {
-            sessionIds.forEach { sessionId ->
-                Timber.v("Restore matrix session: $sessionId")
-                val matrixClient = authenticationService.restoreSession(sessionId)
+            userIds.forEach { userId ->
+                Timber.v("Restore matrix session: $userId")
+                val matrixClient = authenticationService.restoreSession(userId)
                 if (matrixClient != null) {
                     add(matrixClient)
                 }

appnav/src/main/kotlin/io/element/android/appnav/RoomFlowNode.kt

@@ -34,7 +34,7 @@ import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.nodeInputs
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.matrix.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.MatrixRoom
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 

appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt

@@ -49,8 +49,9 @@ import io.element.android.libraries.architecture.nodeInputsProvider
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
-import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
-import io.element.android.libraries.matrix.core.SessionId
+import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.tests.uitests.openShowkase
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
@@ -100,7 +101,7 @@ class RootFlowNode @AssistedInject constructor(
     }
 
     private fun switchToLoggedInFlow(sessionId: SessionId) {
-        backstack.safeRoot(NavTarget.LoggedInFlow(sessionId = sessionId))
+        backstack.safeRoot(NavTarget.LoggedInFlow(sessionId))
     }
 
     private fun switchToLogoutFlow() {
@@ -109,19 +110,19 @@ class RootFlowNode @AssistedInject constructor(
     }
 
     private suspend fun tryToRestoreLatestSession(
-        onSuccess: (SessionId) -> Unit = {},
+        onSuccess: (UserId) -> Unit = {},
         onFailure: () -> Unit = {}
     ) {
-        val latestKnownSessionId = authenticationService.getLatestSessionId()
-        if (latestKnownSessionId == null) {
+        val latestKnownUserId = authenticationService.getLatestSessionId()
+        if (latestKnownUserId == null) {
             onFailure()
             return
         }
-        if (matrixClientsHolder.knowSession(latestKnownSessionId)) {
-            onSuccess(latestKnownSessionId)
+        if (matrixClientsHolder.knowSession(latestKnownUserId)) {
+            onSuccess(latestKnownUserId)
             return
         }
-        val matrixClient = authenticationService.restoreSession(latestKnownSessionId)
+        val matrixClient = authenticationService.restoreSession(UserId(latestKnownUserId.value))
         if (matrixClient == null) {
             Timber.v("Failed to restore session...")
             onFailure()
@@ -141,6 +142,7 @@ class RootFlowNode @AssistedInject constructor(
         fun openShowkase() {
             openShowkase(activity)
         }
+
         val state = presenter.present()
         RootView(
             state = state,

appnav/src/test/kotlin/io/element/android/appnav/FakeBugReporter.kt

@@ -19,7 +19,7 @@ package io.element.android.appnav
 import io.element.android.features.rageshake.reporter.BugReporter
 import io.element.android.features.rageshake.reporter.BugReporterListener
 import io.element.android.features.rageshake.reporter.ReportType
-import io.element.android.libraries.matrixtest.A_FAILURE_REASON
+import io.element.android.libraries.matrix.test.A_FAILURE_REASON
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch