Merge pull request #6610 from SimonBrandner/feature/add-more-call-states

Add new call tile states
matrix-org · Aug 13, 2021 · 26d5b93 · 26d5b93
2 parents 20ac54f + 7faf5f0
commit 26d5b93
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/res/css/views/messages/_CallEvent.scss b/res/css/views/messages/_CallEvent.scss
@@ -80,6 +80,16 @@ limitations under the License.
             mask-image: url('$(res)/img/voip/missed-video.svg');
         }
 
+        &.mx_CallEvent_voice.mx_CallEvent_rejected .mx_CallEvent_type_icon::before,
+        &.mx_CallEvent_voice.mx_CallEvent_noAnswer .mx_CallEvent_type_icon::before {
+            mask-image: url('$(res)/img/voip/declined-voice.svg');
+        }
+
+        &.mx_CallEvent_video.mx_CallEvent_rejected .mx_CallEvent_type_icon::before,
+        &.mx_CallEvent_video.mx_CallEvent_noAnswer .mx_CallEvent_type_icon::before {
+            mask-image: url('$(res)/img/voip/declined-video.svg');
+        }
+
         .mx_CallEvent_info {
             display: flex;
             flex-direction: row;

diff --git a/res/img/voip/declined-video.svg b/res/img/voip/declined-video.svg
diff --git a/res/img/voip/declined-voice.svg b/res/img/voip/declined-voice.svg
diff --git a/src/components/views/messages/CallEvent.tsx b/src/components/views/messages/CallEvent.tsx
@@ -175,7 +175,7 @@ export default class CallEvent extends React.PureComponent<IProps, IState> {
             } else if (hangupReason === CallErrorCode.InviteTimeout) {
                 return (
                     <div className="mx_CallEvent_content">
-                        { _t("Missed call") }
+                        { _t("No answer") }
                         { this.renderCallBackButton(_t("Call back")) }
                     </div>
                 );
@@ -249,10 +249,9 @@ export default class CallEvent extends React.PureComponent<IProps, IState> {
             mx_CallEvent_voice: isVoice,
             mx_CallEvent_video: !isVoice,
             mx_CallEvent_narrow: this.state.narrow,
-            mx_CallEvent_missed: (
-                callState === CustomCallState.Missed ||
-                (callState === CallState.Ended && hangupReason === CallErrorCode.InviteTimeout)
-            ),
+            mx_CallEvent_missed: callState === CustomCallState.Missed,
+            mx_CallEvent_noAnswer: callState === CallState.Ended && hangupReason === CallErrorCode.InviteTimeout,
+            mx_CallEvent_rejected: callState === CallState.Ended && this.props.callEventGrouper.gotRejected,
         });
         let silenceIcon;
         if (this.state.narrow && this.state.callState === CallState.Ringing) {

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1887,13 +1887,14 @@
     "Connected": "Connected",
     "Call declined": "Call declined",
     "Call back": "Call back",
-    "Missed call": "Missed call",
+    "No answer": "No answer",
     "Could not connect media": "Could not connect media",
     "Connection failed": "Connection failed",
     "Their device couldn't start the camera or microphone": "Their device couldn't start the camera or microphone",
     "An unknown error occurred": "An unknown error occurred",
     "Unknown failure: %(reason)s)": "Unknown failure: %(reason)s)",
     "Retry": "Retry",
+    "Missed call": "Missed call",
     "The call is in an unknown state!": "The call is in an unknown state!",
     "Sunday": "Sunday",
     "Monday": "Monday",