From 116bab5bc81b769c19d9a08776214b26019caab8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 27 May 2020 19:02:27 +0200 Subject: [PATCH] Fix call event not rendered in e2e rooms. --- .../timeline/format/NoticeEventFormatter.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt index 86c9f0ab5b..cab5b30190 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt @@ -60,7 +60,7 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active EventType.STATE_ROOM_TOMBSTONE -> formatRoomTombstoneEvent(timelineEvent.senderInfo.disambiguatedDisplayName) EventType.CALL_INVITE, EventType.CALL_HANGUP, - EventType.CALL_ANSWER -> formatCallEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName) + EventType.CALL_ANSWER -> formatCallEvent(type, timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName) EventType.MESSAGE, EventType.REACTION, EventType.KEY_VERIFICATION_START, @@ -87,7 +87,7 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName) EventType.CALL_INVITE, EventType.CALL_HANGUP, - EventType.CALL_ANSWER -> formatCallEvent(event, senderName) + EventType.CALL_ANSWER -> formatCallEvent(type, event, senderName) EventType.STATE_ROOM_TOMBSTONE -> formatRoomTombstoneEvent(senderName) else -> { Timber.v("Type $type not handled by this formatter") @@ -140,9 +140,9 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active return sp.getString(R.string.notice_made_future_room_visibility, senderName, formattedVisibility) } - private fun formatCallEvent(event: Event, senderName: String?): CharSequence? { - return when { - EventType.CALL_INVITE == event.type -> { + private fun formatCallEvent(type: String, event: Event, senderName: String?): CharSequence? { + return when (type) { + EventType.CALL_INVITE -> { val content = event.getClearContent().toModel() ?: return null val isVideoCall = content.offer.sdp == CallInviteContent.Offer.SDP_VIDEO return if (isVideoCall) { @@ -151,9 +151,9 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active sp.getString(R.string.notice_placed_voice_call, senderName) } } - EventType.CALL_ANSWER == event.type -> sp.getString(R.string.notice_answered_call, senderName) - EventType.CALL_HANGUP == event.type -> sp.getString(R.string.notice_ended_call, senderName) - else -> null + EventType.CALL_ANSWER -> sp.getString(R.string.notice_answered_call, senderName) + EventType.CALL_HANGUP -> sp.getString(R.string.notice_ended_call, senderName) + else -> null } }