Merge pull request #1681 from vector-im/feature/other_fixes

Video calls are shown as a voice ones in the timeline (Fixes #1676)
This commit is contained in:
Benoit Marty 2020-07-13 11:31:38 +02:00 committed by GitHub
commit cce1c2252d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View file

@ -8,6 +8,7 @@ Improvements 🙌:
-
Bugfix 🐛:
- Video calls are shown as a voice ones in the timeline (#1676)
- Fix regression: not able to create a room without IS configured (#1679)
Translations 🗣:

View file

@ -59,5 +59,5 @@ data class CallInviteContent(
}
}
fun isVideo(): Boolean = offer?.sdp?.contains(Offer.SDP_VIDEO) == true
fun isVideo() = offer?.sdp?.contains(Offer.SDP_VIDEO) == true
}

View file

@ -286,7 +286,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
return when (type) {
EventType.CALL_INVITE -> {
val content = event.getClearContent().toModel<CallInviteContent>() ?: return null
val isVideoCall = content.offer?.sdp == CallInviteContent.Offer.SDP_VIDEO
val isVideoCall = content.isVideo()
return if (isVideoCall) {
if (event.isSentByCurrentUser()) {
sp.getString(R.string.notice_placed_video_call_by_you)