mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-17 04:20:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Timeline call tiles: fix call event grouper

Browse source
This commit is contained in:
ganfra 2021-07-29 19:55:34 +02:00
parent dc7cc2ed5c
commit ec09532df6
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
View file

@ -36,7 +36,6 @@ import javax.inject.Inject
class CallItemFactory @Inject constructor(
private val session: Session,
private val userPreferencesProvider: UserPreferencesProvider,
private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper,
private val messageColorProvider: MessageColorProvider,
private val messageInformationDataFactory: MessageInformationDataFactory,
private val messageItemAttributesFactory: MessageItemAttributesFactory,
@ -51,10 +50,9 @@ class CallItemFactory @Inject constructor(
val roomId = event.roomId
val informationData = messageInformationDataFactory.create(params)
val callKind = if (callEventGrouper.isVideo()) CallTileTimelineItem.CallKind.VIDEO else CallTileTimelineItem.CallKind.AUDIO
val isRinging = callEventGrouper.isRinging()
return when (event.root.getClearType()) {
EventType.CALL_ANSWER -> {
if (isRinging || showHiddenEvents) {
if (callEventGrouper.isInCall() || showHiddenEvents) {
createCallTileTimelineItem(
roomId = roomId,
callId = callEventGrouper.callId,
@ -63,14 +61,14 @@ class CallItemFactory @Inject constructor(
callback = params.callback,
highlight = params.isHighlighted,
informationData = informationData,
isStillActive = isRinging
isStillActive = callEventGrouper.isInCall()
)
} else {
null
}
}
EventType.CALL_INVITE -> {
if (isRinging || showHiddenEvents) {
if (callEventGrouper.isRinging() || showHiddenEvents) {
createCallTileTimelineItem(
roomId = roomId,
callId = callEventGrouper.callId,
@ -79,7 +77,7 @@ class CallItemFactory @Inject constructor(
callback = params.callback,
highlight = params.isHighlighted,
informationData = informationData,
isStillActive = isRinging
isStillActive = callEventGrouper.isRinging()
)
} else {
null

4
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/CallEventGrouper.kt
View file

@ -39,6 +39,10 @@ class CallEventGrouper(private val myUserId: String, val callId: String) {
return getAnswer() == null && getHangup() == null && getReject() == null
}
fun isInCall(): Boolean{
return getHangup() == null && getReject() == null
}
/**
* Returns true if there are only events from the other side - we missed the call
*/