ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

review: Make call intent not optional in content

Browse Source
This commit is contained in:
Valere
2026-04-21 11:03:48 +02:00
parent b0e9073efb
commit e158be86aa
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt
-1
View File
@@ -108,7 +108,6 @@ internal fun TimelineItemCallNotifyView(
internal fun TimelineItemCallNotifyViewPreview() = ElementPreview { internal fun TimelineItemCallNotifyViewPreview() = ElementPreview {
Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) { Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
listOf( listOf(
TimelineItemRtcNotificationContent(null),
TimelineItemRtcNotificationContent(CallIntent.AUDIO), TimelineItemRtcNotificationContent(CallIntent.AUDIO),
TimelineItemRtcNotificationContent(CallIntent.VIDEO), TimelineItemRtcNotificationContent(CallIntent.VIDEO),
).forEach { content -> ).forEach { content ->
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt
+1 -1
View File
@@ -10,6 +10,6 @@ package io.element.android.features.messages.impl.timeline.model.event
import io.element.android.libraries.matrix.api.notification.CallIntent import io.element.android.libraries.matrix.api.notification.CallIntent
class TimelineItemRtcNotificationContent(val callIntent: CallIntent?) : TimelineItemEventContent { class TimelineItemRtcNotificationContent(val callIntent: CallIntent) : TimelineItemEventContent {
override val type: String = "org.matrix.msc4075.rtc.notification" override val type: String = "org.matrix.msc4075.rtc.notification"
} }
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
+1 -1
View File
@@ -117,7 +117,7 @@ data class LiveLocationContent(
data object LegacyCallInviteContent : EventContent data object LegacyCallInviteContent : EventContent
data class CallNotifyContent( data class CallNotifyContent(
val callIntent: CallIntent? val callIntent: CallIntent
) : EventContent ) : EventContent
data object UnknownContent : EventContent data object UnknownContent : EventContent
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
+5 -7
View File
@@ -110,7 +110,7 @@ class TimelineEventContentMapper(
} }
is MsgLikeKind.LiveLocation -> { is MsgLikeKind.LiveLocation -> {
// Live location messages are a special kind of message that we want to treat as unknown content for now // Live location messages are a special kind of message that we want to treat as unknown content for now
UnknownContent UnknownContent
} }
is MsgLikeKind.Other -> UnknownContent is MsgLikeKind.Other -> UnknownContent
} }
@@ -139,12 +139,10 @@ class TimelineEventContentMapper(
} }
is TimelineItemContent.CallInvite -> LegacyCallInviteContent is TimelineItemContent.CallInvite -> LegacyCallInviteContent
is TimelineItemContent.RtcNotification -> CallNotifyContent( is TimelineItemContent.RtcNotification -> CallNotifyContent(
it.callIntent?.let { intentString -> callIntent = if (it.callIntent == "audio") {
if (intentString == "audio") { CallIntent.AUDIO
CallIntent.AUDIO } else {
} else { CallIntent.VIDEO
CallIntent.VIDEO
}
} }
) )
} }