Merge branch 'dev' of github.com:wireapp/wire-webapp into in-call-han…

…d-raise
wireapp · Dec 4, 2024 · 3357171 · 3357171
2 parents 453af47 + ee3fc70
commit 3357171
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/app-config/package.json b/app-config/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.32.0",
+    "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.36",
     "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.32.0"
   }
 }
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "@wireapp/avs": "10.0.4",
     "@wireapp/avs-debugger": "0.0.5",
     "@wireapp/commons": "5.4.0",
-    "@wireapp/core": "46.11.4",
+    "@wireapp/core": "46.11.6",
     "@wireapp/react-ui-kit": "9.28.0",
     "@wireapp/store-engine-dexie": "2.1.15",
     "@wireapp/telemetry": "0.1.3",

diff --git a/src/script/calling/CallingRepository.test.ts b/src/script/calling/CallingRepository.test.ts
@@ -132,10 +132,12 @@ describe('CallingRepository', () => {
         buildMediaDevicesHandler(),
       );
 
+      call.state(CALL_STATE.MEDIA_ESTAB);
+
       conversation.roles({[senderUserId.id]: DefaultConversationRoleName.WIRE_ADMIN});
 
       callingRepository['conversationState'].conversations.push(conversation);
-      spyOn(callingRepository, 'findCall').and.returnValue(call);
+      callingRepository['callState'].calls([call]);
       spyOn(callingRepository, 'muteCall').and.callThrough();
       spyOn(wCall, 'recvMsg').and.callThrough();
 
@@ -176,10 +178,12 @@ describe('CallingRepository', () => {
         buildMediaDevicesHandler(),
       );
 
+      call.state(CALL_STATE.MEDIA_ESTAB);
+
       conversation.roles({[senderUserId.id]: DefaultConversationRoleName.WIRE_MEMBER});
 
       callingRepository['conversationState'].conversations.push(conversation);
-      spyOn(callingRepository, 'findCall').and.returnValue(call);
+      callingRepository['callState'].calls([call]);
       spyOn(callingRepository, 'muteCall').and.callThrough();
       spyOn(wCall, 'recvMsg').and.callThrough();
 
@@ -220,10 +224,12 @@ describe('CallingRepository', () => {
         buildMediaDevicesHandler(),
       );
 
+      call.state(CALL_STATE.MEDIA_ESTAB);
+
       conversation.roles({[senderUserId.id]: DefaultConversationRoleName.WIRE_ADMIN});
 
       callingRepository['conversationState'].conversations.push(conversation);
-      spyOn(callingRepository, 'findCall').and.returnValue(call);
+      callingRepository['callState'].calls([call]);
       spyOn(callingRepository, 'muteCall').and.callThrough();
       spyOn(wCall, 'recvMsg').and.callThrough();
 

diff --git a/src/script/calling/CallingRepository.ts b/src/script/calling/CallingRepository.ts
@@ -759,8 +759,12 @@ export class CallingRepository {
       }
 
       case CALL_MESSAGE_TYPE.REMOTE_MUTE: {
-        const call = this.findCall(conversationId);
-        if (!call) {
+        const currentCall = this.callState.joinedCall();
+        if (
+          !currentCall ||
+          !matchQualifiedIds(currentCall.conversation.qualifiedId, conversationId) ||
+          !this.selfUser
+        ) {
           return;
         }
 
@@ -783,7 +787,7 @@ export class CallingRepository {
           return;
         }
 
-        this.muteCall(call, true, MuteState.REMOTE_MUTED);
+        this.muteCall(currentCall, true, MuteState.REMOTE_MUTED);
         return this.processCallingMessage(conversation, event);
       }