filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#7761 Fixed case when event info is absent

This commit is contained in:
roman.turubayev@econophysica.com 2024-09-01 13:25:50 +07:00
parent 596ca511d2
commit 74a0b180d7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
View File

@ -35,7 +35,7 @@ class NotificationFactory @Inject constructor(
eventId = events.firstOrNull()?.event?.eventId.orEmpty(), eventId = events.firstOrNull()?.event?.eventId.orEmpty(),
roomName = events.firstOrNull()?.event?.roomName.orEmpty(), roomName = events.firstOrNull()?.event?.roomName.orEmpty(),
notification = notificationUtils.buildIncomingJitsiCallNotification( notification = notificationUtils.buildIncomingJitsiCallNotification(
callId = events.firstOrNull()?.event?.eventId.orEmpty(), callId = events.firstOrNull()?.event?.eventId.orEmpty().ifEmpty { roomId },
signalingRoomId = roomId, signalingRoomId = roomId,
otherUserId = events.firstOrNull()?.event?.matrixID.orEmpty(), otherUserId = events.firstOrNull()?.event?.matrixID.orEmpty(),
isIncomingCall = true, isIncomingCall = true,

5
vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt
View File

@ -76,8 +76,9 @@ class NotificationRenderer @Inject constructor(
when (wrapper) { when (wrapper) {
is JitsiNotification.IncomingCall -> { is JitsiNotification.IncomingCall -> {
Timber.d("Updating jitsi call notification ${wrapper.roomId} for room ${wrapper.roomName}") Timber.d("Updating jitsi call notification ${wrapper.roomId} for room ${wrapper.roomName}")
if (wrapper.eventId.isNotEmpty()) { if (wrapper.eventId.isNotEmpty() || wrapper.roomId.isNotEmpty()) {
notificationDisplayer.showNotificationMessage(wrapper.eventId, JITSI_CALL_NOTIFICATION_ID, wrapper.notification) val tag = wrapper.eventId.ifEmpty { wrapper.roomId }
notificationDisplayer.showNotificationMessage(tag, JITSI_CALL_NOTIFICATION_ID, wrapper.notification)
} }
} }
} }