From 0ed40c562dfc98a0609b9522d45249febeaa0cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Mon, 22 Dec 2025 10:04:04 +0100
Subject: [PATCH] Replace some usages of `TimelineEventType` in `EventType`
 with `TimelineEventContent`

---
 .../TimelineEventToNotificationContentMapper.kt      | 12 ++++++------
 .../impl/fixtures/factories/TimelineEventType.kt     |  8 ++++----
 .../impl/fixtures/fakes/FakeFfiTimelineEvent.kt      |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt
index b38ad719a9..450216b452 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt
@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.impl.timeline.item.event.EventMessage
 import org.matrix.rustcomponents.sdk.MessageLikeEventContent
 import org.matrix.rustcomponents.sdk.StateEventContent
 import org.matrix.rustcomponents.sdk.TimelineEvent
-import org.matrix.rustcomponents.sdk.TimelineEventType
+import org.matrix.rustcomponents.sdk.TimelineEventContent
 import org.matrix.rustcomponents.sdk.use
 import org.matrix.rustcomponents.sdk.RtcNotificationType as SdkRtcNotificationType
 
@@ -27,18 +27,18 @@ class TimelineEventToNotificationContentMapper {
         return runCatchingExceptions {
             timelineEvent.use {
                 val senderId = UserId(timelineEvent.senderId())
-                timelineEvent.eventType().use { eventType ->
-                    eventType.toContent(senderId = senderId)
+                timelineEvent.content().use { eventContent ->
+                    eventContent.toContent(senderId = senderId)
                 }
             }
         }
     }
 }
 
-private fun TimelineEventType.toContent(senderId: UserId): NotificationContent {
+private fun TimelineEventContent.toContent(senderId: UserId): NotificationContent {
     return when (this) {
-        is TimelineEventType.MessageLike -> content.toContent(senderId)
-        is TimelineEventType.State -> content.toContent()
+        is TimelineEventContent.MessageLike -> content.toContent(senderId)
+        is TimelineEventContent.State -> content.toContent()
     }
 }
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt
index 395b2aefe2..8d87afb4e7 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt
@@ -13,12 +13,12 @@ import org.matrix.rustcomponents.sdk.FormattedBody
 import org.matrix.rustcomponents.sdk.MessageLikeEventContent
 import org.matrix.rustcomponents.sdk.MessageType
 import org.matrix.rustcomponents.sdk.TextMessageContent
-import org.matrix.rustcomponents.sdk.TimelineEventType
+import org.matrix.rustcomponents.sdk.TimelineEventContent
 
-fun aRustTimelineEventTypeMessageLike(
+fun aRustTimelineEventContentMessageLike(
     content: MessageLikeEventContent = aRustMessageLikeEventContentRoomMessage(),
-): TimelineEventType.MessageLike {
-    return TimelineEventType.MessageLike(
+): TimelineEventContent.MessageLike {
+    return TimelineEventContent.MessageLike(
         content = content,
     )
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt
index f364ca635a..80eec5efe7 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt
@@ -8,19 +8,19 @@
 
 package io.element.android.libraries.matrix.impl.fixtures.fakes
 
-import io.element.android.libraries.matrix.impl.fixtures.factories.aRustTimelineEventTypeMessageLike
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustTimelineEventContentMessageLike
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
 import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.TimelineEvent
-import org.matrix.rustcomponents.sdk.TimelineEventType
+import org.matrix.rustcomponents.sdk.TimelineEventContent
 
 open class FakeFfiTimelineEvent(
     val timestamp: ULong = A_FAKE_TIMESTAMP.toULong(),
-    val timelineEventType: TimelineEventType = aRustTimelineEventTypeMessageLike(),
+    val timelineEventContent: TimelineEventContent = aRustTimelineEventContentMessageLike(),
     val senderId: String = A_USER_ID_2.value,
 ) : TimelineEvent(NoHandle) {
     override fun timestamp(): ULong = timestamp
-    override fun eventType(): TimelineEventType = timelineEventType
+    override fun content(): TimelineEventContent = timelineEventContent
     override fun senderId(): String = senderId
 }