felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-20 16:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use new strings for ended calls

Browse Source
This commit is contained in:
ismailgulek
2021-08-06 16:20:10 +03:00
parent 266a3665ff
commit b22868b0a0
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Views/BubbleCells/Call/Direct/RoomDirectCallStatusBubbleCell.swift
+18 -10
View File
@@ -220,27 +220,27 @@ class RoomDirectCallStatusBubbleCell: RoomBaseCallBubbleCell {
.remoteHangup,
.answeredElseWhere:
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
case .missed:
if call.isIncoming {
viewState = .missed
statusText = isVideoCall ? VectorL10n.eventFormatterCallMissedVideo : VectorL10n.eventFormatterCallMissedVoice
} else {
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
}
case .busy:
configureForRejectedCall(call: call)
@unknown default:
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
}
case .inviteExpired,
.answeredElseWhere:
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
@unknown default:
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
}
}
@@ -261,21 +261,21 @@ class RoomDirectCallStatusBubbleCell: RoomBaseCallBubbleCell {
statusText = VectorL10n.eventFormatterCallYouDeclined
} else {
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
}
}
private func configureForHangupCall(withEvent event: MXEvent) {
guard let hangupEventContent = MXCallHangupEventContent(fromJSON: event.content) else {
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
return
}
switch hangupEventContent.reasonType {
case .userHangup:
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
default:
viewState = .failed
statusText = VectorL10n.eventFormatterCallConnectionFailed
@@ -290,7 +290,15 @@ class RoomDirectCallStatusBubbleCell: RoomBaseCallBubbleCell {
} else {
// outgoing unanswered call
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
}
}
private func updateStatusTextForEndedCall() {
if callDurationString.count > 0 {
statusText = VectorL10n.eventFormatterCallHasEndedWithTime(callDurationString)
} else {
statusText = VectorL10n.eventFormatterCallHasEnded
}
}
@@ -404,7 +412,7 @@ class RoomDirectCallStatusBubbleCell: RoomBaseCallBubbleCell {
// there is no reject or hangup event, we can just say this call has ended
viewState = .ended
statusText = VectorL10n.eventFormatterCallHasEnded(callDurationString)
updateStatusTextForEndedCall()
return
}