We do not need CurrentSessionIdHolder anymore.

The SessionId can be provided by SessionMatrixModule and injected in constructors directly.

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt

@@ -13,6 +13,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
 import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
@@ -31,7 +32,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.StickerConten
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.api.timeline.item.event.UnknownContent
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
-import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder
 
 @Inject
 class TimelineItemContentFactory(
@@ -45,7 +45,7 @@ class TimelineItemContentFactory(
     private val stateFactory: TimelineItemContentStateFactory,
     private val failedToParseMessageFactory: TimelineItemContentFailedToParseMessageFactory,
     private val failedToParseStateFactory: TimelineItemContentFailedToParseStateFactory,
-    private val currentSessionIdHolder: CurrentSessionIdHolder,
+    private val sessionId: SessionId,
 ) {
     suspend fun create(eventTimelineItem: EventTimelineItem): TimelineItemEventContent {
         return create(
@@ -64,7 +64,7 @@ class TimelineItemContentFactory(
         sender: UserId,
         senderProfile: ProfileTimelineDetails,
     ): TimelineItemEventContent {
-        val isOutgoing = currentSessionIdHolder.current == sender
+        val isOutgoing = sessionId == sender
         return when (itemContent) {
             is FailedToParseMessageLikeContent -> failedToParseMessageFactory.create(itemContent)
             is FailedToParseStateContent -> failedToParseStateFactory.create(itemContent)

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt

@@ -33,7 +33,6 @@ import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.eventformatter.api.TimelineEventFormatter
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
-import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation
@@ -78,7 +77,7 @@ internal fun TestScope.aTimelineItemsFactory(
                         stateFactory = TimelineItemContentStateFactory(timelineEventFormatter),
                         failedToParseMessageFactory = TimelineItemContentFailedToParseMessageFactory(),
                         failedToParseStateFactory = TimelineItemContentFailedToParseStateFactory(),
-                        currentSessionIdHolder = CurrentSessionIdHolder(matrixClient),
+                        sessionId = matrixClient.sessionId,
                     ),
                     matrixClient = matrixClient,
                     dateFormatter = FakeDateFormatter(),

features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt

@@ -33,8 +33,8 @@ import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
 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.UserId
-import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import kotlinx.parcelize.Parcelize
@@ -45,7 +45,7 @@ class UserProfileFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val elementCallEntryPoint: ElementCallEntryPoint,
-    private val sessionIdHolder: CurrentSessionIdHolder,
+    private val sessionId: SessionId,
     private val mediaViewerEntryPoint: MediaViewerEntryPoint,
     private val outgoingVerificationEntryPoint: OutgoingVerificationEntryPoint,
 ) : BaseFlowNode<UserProfileFlowNode.NavTarget>(
@@ -82,7 +82,7 @@ class UserProfileFlowNode(
                     }
 
                     override fun onStartCall(dmRoomId: RoomId) {
-                        elementCallEntryPoint.startCall(CallType.RoomCall(sessionId = sessionIdHolder.current, roomId = dmRoomId))
+                        elementCallEntryPoint.startCall(CallType.RoomCall(sessionId = sessionId, roomId = dmRoomId))
                     }
 
                     override fun onVerifyUser(userId: UserId) {
@@ -99,7 +99,7 @@ class UserProfileFlowNode(
                     }
 
                     override fun onViewInTimeline(eventId: EventId) {
-                       // Cannot happen
+                        // Cannot happen
                     }
                 }
                 mediaViewerEntryPoint.nodeBuilder(this, buildContext)

features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPointTest.kt

@@ -19,9 +19,8 @@ import io.element.android.features.verifysession.api.OutgoingVerificationEntryPo
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder
+import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
@@ -43,7 +42,7 @@ class DefaultUserProfileEntryPointTest {
             UserProfileFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                sessionIdHolder = CurrentSessionIdHolder(FakeMatrixClient()),
+                sessionId = A_SESSION_ID,
                 elementCallEntryPoint = object : ElementCallEntryPoint {
                     override fun startCall(callType: CallType) = lambdaError()
                     override suspend fun handleIncomingCall(