Skip to content

Fix acs room audio video enabled notifications #5563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fuyan2024 merged 9 commits into from
Jan 16, 2025
Merged

Fix acs room audio video enabled notifications #5563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3716642
Fix acs room capability issue.
fuyan2024 Jan 16, 2025
dab8870
Change files
fuyan2024 Jan 16, 2025
9d2e57f
test update
fuyan2024 Jan 16, 2025
35c1e87
update
fuyan2024 Jan 16, 2025
8064c8e
Update comment in change log JSON file
fuyan2024 Jan 16, 2025
b7a3392
Update comment for ACS room notifications fix
fuyan2024 Jan 16, 2025
f9fdaa6
test
fuyan2024 Jan 16, 2025
a0abd5c
Merge remote-tracking branch 'origin/main' into fuyan/hard-mute-acs-r…
fuyan2024 Jan 16, 2025
68a993c
Revert previous change
fuyan2024 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-12eaa2c3-a391-4f29-bc58-056af9550adf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Hard mute",
"comment": "Fix acs room audio video enabled notifications. when acs user just joined room, should not show the audio video enabled notifications",
"packageName": "@azure/communication-react",
"email": "fuyan@microsoft.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-12eaa2c3-a391-4f29-bc58-056af9550adf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Hard mute",
"comment": "Fix acs room audio video enabled notifications. when acs user just joined room, should not show the audio video enabled notifications",
"packageName": "@azure/communication-react",
"email": "fuyan@microsoft.com",
"dependentChangeType": "patch"
}
17 changes: 15 additions & 2 deletions packages/calling-stateful-client/src/CapabilitiesSubscriber.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export class CapabilitiesSubscriber {
private _callIdRef: CallIdRef;
private _context: CallContext;
private _capabilitiesFeature: CapabilitiesFeature;
/* @conditional-compile-remove(media-access) */
private _capabilitiesInitialized: boolean = false;

constructor(callIdRef: CallIdRef, context: CallContext, capabilities: CapabilitiesFeature) {
this._callIdRef = callIdRef;
Expand All @@ -38,12 +40,19 @@ export class CapabilitiesSubscriber {
}
/* @conditional-compile-remove(media-access) */
this.setUnmuteMicAndTurnVideoOnNotification(data);

/* @conditional-compile-remove(media-access) */
this._capabilitiesInitialized = true;
};

/* @conditional-compile-remove(media-access) */
private setUnmuteMicAndTurnVideoOnNotification = (data: CapabilitiesChangeInfo): void => {
if (data.oldValue.turnVideoOn?.isPresent !== data.newValue.turnVideoOn?.isPresent) {
if (data.oldValue.turnVideoOn?.isPresent === false && data.newValue.turnVideoOn?.isPresent) {
if (
data.oldValue.turnVideoOn?.isPresent === false &&
data.newValue.turnVideoOn?.isPresent &&
this._capabilitiesInitialized
) {
const capabilityTurnVideoOnAbsent = this._context.getState().latestNotifications.capabilityTurnVideoOnAbsent;
if (capabilityTurnVideoOnAbsent) {
this._context.deleteLatestNotification(this._callIdRef.callId, 'capabilityTurnVideoOnAbsent');
Expand Down Expand Up @@ -72,7 +81,11 @@ export class CapabilitiesSubscriber {
}
}
if (data.oldValue.unmuteMic?.isPresent !== data.newValue.unmuteMic?.isPresent) {
if (data.oldValue.unmuteMic?.isPresent === false && data.newValue.unmuteMic?.isPresent) {
if (
data.oldValue.unmuteMic?.isPresent === false &&
data.newValue.unmuteMic?.isPresent &&
this._capabilitiesInitialized
) {
const capabilityUnmuteMicAbsent = this._context.getState().latestNotifications.capabilityUnmuteMicAbsent;
if (capabilityUnmuteMicAbsent) {
this._context.deleteLatestNotification(this._callIdRef.callId, 'capabilityUnmuteMicAbsent');
Expand Down
⚡