Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CallTileTimelineItem.CallStatus.MISSED renders both missed and reject… #5089

Merged
merged 2 commits into from
Feb 2, 2022
Merged

CallTileTimelineItem.CallStatus.MISSED renders both missed and reject… #5089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ae76d
CallTileTimelineItem.CallStatus.MISSED renders both missed and reject…
langleyd Jan 28, 2022
a78d88f
Invert if condition and split long line
bmarty Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5088.bugfix
View file
Open in desktop
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.
6 changes: 5 additions & 1 deletion ...src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 2 additions & 5 deletions ...main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventsGroups.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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? {
Expand Down