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

Jitsi widget: use state_key instead of widget content

Browse source
This commit is contained in:
ganfra 2021-08-13 14:54:38 +02:00
parent 4821852430
commit 8bd1cd6b17
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ class WidgetItemFactory @Inject constructor(
null
}
}
val callStatus = if (isActiveTile && widgetContent.id == params.partialState.jitsiState.widgetId) {
val callStatus = if (isActiveTile && params.event.root.stateKey == params.partialState.jitsiState.widgetId) {
if (params.partialState.jitsiState.hasJoined) {
CallTileTimelineItem.CallStatus.IN_CALL
} else {

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

@ -58,22 +58,7 @@ class TimelineEventsGroups {
return if (EventType.isCallEvent(type)) {
(content?.get("call_id") as? String)
} else if (type == EventType.STATE_ROOM_WIDGET || type == EventType.STATE_ROOM_WIDGET_LEGACY) {
val widgetContent: WidgetContent = root.getClearContent().toModel() ?: return null
if (widgetContent.isActive()) {
widgetContent.getJitsiIdOrNull()
} else {
val prevWidgetContent: WidgetContent = root.resolvedPrevContent().toModel() ?: return null
prevWidgetContent.getJitsiIdOrNull()
}
} else {
null
}
}
private fun WidgetContent.getJitsiIdOrNull(): String? {
val isJitsi = WidgetType.fromString(type ?: "") == WidgetType.Jitsi
return if (isJitsi) {
id
root.stateKey
} else {
null
}