Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Replace some usages of TimelineEventType in EventType with TimelineEventContent

Browse source
This commit is contained in:
Jorge Martín 2025-12-22 10:04:04 +01:00 • committed by Jorge Martin Espinosa
parent 8061264629
commit 63d205f8aa
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt
View file

@ -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.MessageLikeEventContent
import org.matrix.rustcomponents.sdk.StateEventContent import org.matrix.rustcomponents.sdk.StateEventContent
import org.matrix.rustcomponents.sdk.TimelineEvent 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.use
import org.matrix.rustcomponents.sdk.RtcNotificationType as SdkRtcNotificationType import org.matrix.rustcomponents.sdk.RtcNotificationType as SdkRtcNotificationType
@ -27,18 +27,18 @@ class TimelineEventToNotificationContentMapper {
return runCatchingExceptions { return runCatchingExceptions {
timelineEvent.use { timelineEvent.use {
val senderId = UserId(timelineEvent.senderId()) val senderId = UserId(timelineEvent.senderId())
timelineEvent.eventType().use { eventType -> timelineEvent.content().use { eventContent ->
eventType.toContent(senderId = senderId) eventContent.toContent(senderId = senderId)
} }
} }
} }
} }
} }
private fun TimelineEventType.toContent(senderId: UserId): NotificationContent { private fun TimelineEventContent.toContent(senderId: UserId): NotificationContent {
return when (this) { return when (this) {
is TimelineEventType.MessageLike -> content.toContent(senderId) is TimelineEventContent.MessageLike -> content.toContent(senderId)
is TimelineEventType.State -> content.toContent() is TimelineEventContent.State -> content.toContent()
} }
} }

8
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt
View file

@ -13,12 +13,12 @@ import org.matrix.rustcomponents.sdk.FormattedBody
import org.matrix.rustcomponents.sdk.MessageLikeEventContent import org.matrix.rustcomponents.sdk.MessageLikeEventContent
import org.matrix.rustcomponents.sdk.MessageType import org.matrix.rustcomponents.sdk.MessageType
import org.matrix.rustcomponents.sdk.TextMessageContent 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(), content: MessageLikeEventContent = aRustMessageLikeEventContentRoomMessage(),
): TimelineEventType.MessageLike { ): TimelineEventContent.MessageLike {
return TimelineEventType.MessageLike( return TimelineEventContent.MessageLike(
content = content, content = content,
) )
} }

8
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt
View file

@ -8,19 +8,19 @@
package io.element.android.libraries.matrix.impl.fixtures.fakes 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.libraries.matrix.test.A_USER_ID_2
import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
import org.matrix.rustcomponents.sdk.NoHandle import org.matrix.rustcomponents.sdk.NoHandle
import org.matrix.rustcomponents.sdk.TimelineEvent import org.matrix.rustcomponents.sdk.TimelineEvent
import org.matrix.rustcomponents.sdk.TimelineEventType import org.matrix.rustcomponents.sdk.TimelineEventContent
open class FakeFfiTimelineEvent( open class FakeFfiTimelineEvent(
val timestamp: ULong = A_FAKE_TIMESTAMP.toULong(), val timestamp: ULong = A_FAKE_TIMESTAMP.toULong(),
val timelineEventType: TimelineEventType = aRustTimelineEventTypeMessageLike(), val timelineEventContent: TimelineEventContent = aRustTimelineEventContentMessageLike(),
val senderId: String = A_USER_ID_2.value, val senderId: String = A_USER_ID_2.value,
) : TimelineEvent(NoHandle) { ) : TimelineEvent(NoHandle) {
override fun timestamp(): ULong = timestamp override fun timestamp(): ULong = timestamp
override fun eventType(): TimelineEventType = timelineEventType override fun content(): TimelineEventContent = timelineEventContent
override fun senderId(): String = senderId override fun senderId(): String = senderId
} }