[STREAM-878] - Check length of conversations object to pass in proper boolean into SVH

Author: maxwellmooney13

src/headsets/headset-types.ts

@@ -30,7 +30,7 @@ export interface ISdkHeadsetService {
   retryConnection (micLabel: string): Promise<void>;
   setRinging (callInfo: { conversationId: string, contactName?: string }, hasOtherActiveCalls: boolean): Promise<void>;
   outgoingCall (callInfo: { conversationId: string, contactName?: string }): Promise<void>;
-  endCurrentCall (conversationId: string): Promise<void>;
+  endCurrentCall (conversationId: string, hasOtherActiveCalls: boolean): Promise<void>;
   endAllCalls (): Promise<void>;
   answerIncomingCall (conversationId: string, autoAnswer: boolean): Promise<void>;
   rejectIncomingCall (conversationId: string, expectExistingConversation?: boolean): Promise<void>;

src/headsets/headset.ts

@@ -304,8 +304,8 @@ export class HeadsetProxyService implements ISdkHeadsetService {
     return this.currentHeadsetService.outgoingCall(callInfo);
   }
 
-  endCurrentCall (conversationId: string): Promise<void> {
-    return this.currentHeadsetService.endCurrentCall(conversationId);
+  endCurrentCall (conversationId: string, hasOtherActiveCalls: boolean): Promise<void> {
+    return this.currentHeadsetService.endCurrentCall(conversationId, hasOtherActiveCalls);
   }
 
   endAllCalls (): Promise<void> {

src/headsets/sdk-headset-base.ts

@@ -72,7 +72,7 @@ export abstract class SdkHeadsetBase implements ISdkHeadsetService {
    * @param conversationId a string representing the conversation that needs to be ended
    * @returns Promise<void>
    */
-  async endCurrentCall (_conversationId: string): Promise<void> { /* no-op */ }
+  async endCurrentCall (_conversationId: string, _hasOtherActiveCalls: boolean): Promise<void> { /* no-op */ }
 
   /**
    * Calls the headset library's endAllCalls() function to signal the device

src/headsets/sdk-headset-service.ts

@@ -108,9 +108,9 @@ export class SdkHeadsetService extends SdkHeadsetBase {
    * @param conversationId a string representing the conversation that needs to be ended
    * @returns Promise<void>
    */
-  async endCurrentCall (conversationId: string): Promise<void> {
+  async endCurrentCall (conversationId: string, hasOtherActiveCalls: boolean): Promise<void> {
     if (conversationId) {
-      return this.headsetLibrary.endCall(conversationId);
+      return this.headsetLibrary.endCall(conversationId, hasOtherActiveCalls);
     }
   }
 

src/sessions/softphone-session-handler.ts

@@ -342,7 +342,7 @@ export class SoftphoneSessionHandler extends BaseSessionHandler {
         if (this.isPendingState(previousCallState) && !isOutbound) {
           this.sdk.headset.rejectIncomingCall(conversationId);
         } else {
-          this.sdk.headset.endCurrentCall(conversationId);
+          this.sdk.headset.endCurrentCall(conversationId, Object.keys(this.conversations).length > 1);
         }
 
         HeadsetChangesQueue.clearQueue();

test/unit/headset/headset.test.ts

@@ -145,11 +145,11 @@ describe('SdkHeadsetService', () => {
   describe('endCurrentCall', () => {
     it('should call the proper function in the headset library', () => {
       const endCurrentCallSpy = jest.spyOn(headsetLibrary, 'endCall');
-      sdkHeadset.endCurrentCall('');
+      sdkHeadset.endCurrentCall('', false);
       expect(endCurrentCallSpy).not.toHaveBeenCalled();
 
-      sdkHeadset.endCurrentCall('123');
-      expect(endCurrentCallSpy).toHaveBeenCalledWith('123');
+      sdkHeadset.endCurrentCall('123', false);
+      expect(endCurrentCallSpy).toHaveBeenCalledWith('123', false);
 
       const endAllCallsSpy = jest.spyOn(headsetLibrary, 'endAllCalls');
       sdkHeadset.endAllCalls();
@@ -235,7 +235,7 @@ describe('SdkHeadsetServiceStub', () => {
 
   describe('endCurrentCall()', () => {
     it('should return an empty promise', async () => {
-      expect(await headsetStub.endCurrentCall('')).toBe(undefined);
+      expect(await headsetStub.endCurrentCall('', false)).toBe(undefined);
     });
   });
 
@@ -867,8 +867,8 @@ describe('HeadsetProxyService', () => {
   describe('endCurrentCall', () => {
     it('should proxy to headsetService', () => {
       const spy = currentHeadsetService.endCurrentCall = jest.fn();
-      proxyService.endCurrentCall('123');
-      expect(spy).toHaveBeenCalledWith('123');
+      proxyService.endCurrentCall('123', false);
+      expect(spy).toHaveBeenCalledWith('123', false);
     });
   });