PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Say when a call was answered from a different device (#10224)

Browse source 
* Say when a call was answered from a different device

* Adjust font size on call tiles to match designs
This commit is contained in:
Robin 2023-02-24 09:45:53 -05:00 committed by GitHub
parent 73de53468a
commit 4c79ecf141
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/css/views/messages/_LegacyCallEvent.pcss
View file

@ -160,6 +160,7 @@ limitations under the License.
flex-wrap: wrap;
align-items: center;
color: $secondary-content;
font-size: $font-12px;
gap: $spacing-12; /* See mx_IncomingLegacyCallToast_buttons */
margin-inline-start: 42px; /* avatar (32px) + mx_LegacyCallEvent_info_basic margin (10px) */
word-break: break-word;
@ -168,6 +169,7 @@ limitations under the License.
.mx_LegacyCallEvent_content_button {
@mixin LegacyCallButton;
padding: 0 $spacing-12;
font-size: inherit;
span::before {
mask-size: 16px;

4
src/components/structures/LegacyCallEventGrouper.ts
View file

@ -72,7 +72,7 @@ export function buildLegacyCallEventGroupers(
export default class LegacyCallEventGrouper extends EventEmitter {
private events: Set<MatrixEvent> = new Set<MatrixEvent>();
private call: MatrixCall;
private call: MatrixCall | null = null;
public state: CallState | CustomCallState;
public constructor() {
@ -111,7 +111,7 @@ export default class LegacyCallEventGrouper extends EventEmitter {
}
public get hangupReason(): string | null {
return this.hangup?.getContent()?.reason;
return this.call?.hangupReason ?? this.hangup?.getContent()?.reason ?? null;
}
public get rejectParty(): string {

7
src/components/views/messages/LegacyCallEvent.tsx
View file

@ -191,6 +191,13 @@ export default class LegacyCallEvent extends React.PureComponent<IProps, IState>
{this.props.timestamp}
</div>
);
} else if (hangupReason === CallErrorCode.AnsweredElsewhere) {
return (
<div className="mx_LegacyCallEvent_content">
{_t("Answered elsewhere")}
{this.props.timestamp}
</div>
);
}
let reason;

1
src/i18n/strings/en_EN.json
View file

@ -2351,6 +2351,7 @@
"Call declined": "Call declined",
"Call back": "Call back",
"No answer": "No answer",
"Answered elsewhere": "Answered elsewhere",
"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",