Bump Matrix Rust SDK to v0.2.21 and fix conflicts (#2938)

This commit is contained in:
Jorge Martin Espinosa 2024-05-29 13:12:44 +02:00 committed by GitHub
parent 3080dac220
commit a1adc7476d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 23 additions and 3 deletions

View file

@ -150,8 +150,10 @@ class DefaultNotifiableEventResolver @Inject constructor(
}
NotificationContent.MessageLike.CallAnswer,
NotificationContent.MessageLike.CallCandidates,
NotificationContent.MessageLike.CallHangup -> null.also {
NotificationContent.MessageLike.CallHangup,
is NotificationContent.MessageLike.CallNotify -> { // TODO CallNotify will be handled separately in the future
Timber.tag(loggerTag.value).d("Ignoring notification for call ${content.javaClass.simpleName}")
null
}
is NotificationContent.MessageLike.CallInvite -> {
buildNotifiableMessageEvent(