Merge pull request #5089 from vector-im/feature/dla/fix_incorrect_cal…

…l_status CallTileTimelineItem.CallStatus.MISSED renders both missed and reject…
element-hq · Feb 2, 2022 · 54fb28c · 54fb28c
2 parents 0391684 + a78d88f
commit 54fb28c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/changelog.d/5088.bugfix b/changelog.d/5088.bugfix
@@ -0,0 +1 @@
+Fixes call statuses in the timeline for missed/rejected calls and connected calls.
diff --git a/...src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt b/...src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
@@ -101,7 +101,11 @@ class CallItemFactory @Inject constructor(
                 createCallTileTimelineItem(
                         roomSummary = roomSummary,
                         callId = callEventGrouper.callId,
-                        callStatus = if (callEventGrouper.callWasMissed()) CallTileTimelineItem.CallStatus.MISSED else CallTileTimelineItem.CallStatus.ENDED,
+                        callStatus = if (callEventGrouper.callWasAnswered()) {
+                            CallTileTimelineItem.CallStatus.ENDED
+                        } else {
+                            CallTileTimelineItem.CallStatus.MISSED
+                        },
                         callKind = callKind,
                         callback = params.callback,
                         highlight = params.isHighlighted,

diff --git a/...main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventsGroups.kt b/...main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventsGroups.kt
@@ -108,11 +108,8 @@ class CallSignalingEventsGroup(private val group: TimelineEventsGroup) {
         }
     }
 
-    /**
-     * Returns true if there are only events from one side.
-     */
-    fun callWasMissed(): Boolean {
-        return group.events.distinctBy { it.senderInfo.userId }.size == 1
+    fun callWasAnswered(): Boolean {
+        return getAnswer() != null
     }
 
     private fun getAnswer(): TimelineEvent? {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixes call statuses in the timeline for missed/rejected calls and connected calls.