[Fix]Call event overflow (#889)

Author: ipavlidakis

Sources/StreamVideoSwiftUI/CallViewModel.swift

@@ -211,10 +211,6 @@ open class CallViewModel: ObservableObject {
         }
     }
 
-    /// A simple value, signalling that the viewModel has been subscribed to receive callEvents from
-    /// `StreamVideo`.
-    private(set) var isSubscribedToCallEvents: Bool = false
-
     public init(
         participantsLayout: ParticipantsLayout = .grid,
         callSettings: CallSettings? = nil
@@ -589,7 +585,9 @@ open class CallViewModel: ObservableObject {
             self.call = call
         } else if call == nil, callingState != .idle {
             setCallingState(.idle)
-            self.call = nil
+            Task { @MainActor in
+                self.call = nil
+            }
         }
     }
 
@@ -817,10 +815,13 @@ open class CallViewModel: ObservableObject {
                         handleAcceptedEvent(callEvent)
                     case .rejected:
                         handleRejectedEvent(callEvent)
-                    case .ended:
+                    case let .ended(event) where event.callCid == call?.cId:
                         Task { @MainActor [weak self] in
                             self?.leaveCall()
                         }
+                    case .ended:
+                        // Another call ended. No action is required.
+                        break
                     case let .userBlocked(callEventInfo):
                         if
                             callEventInfo.user?.id == streamVideo.user.id,

StreamVideoSwiftUITests/CallViewModel_Tests.swift

@@ -2,7 +2,6 @@
 // Copyright © 2025 Stream.io Inc. All rights reserved.
 //
 
-#if swift(>=6.0)
 @testable import StreamVideo
 @testable import StreamVideoSwiftUI
 import StreamWebRTC
@@ -32,9 +31,7 @@ final class CallViewModel_Tests: XCTestCase, @unchecked Sendable {
         thirdUser = nil
         secondUser = nil
         firstUser = nil
-        mockResponseBuilder = nil
-        peerConnectionFactory = nil
-        super.tearDown()
+        try await super.tearDown()
     }
 
     @MainActor
@@ -554,6 +551,46 @@ final class CallViewModel_Tests: XCTestCase, @unchecked Sendable {
         await fulfilmentInMainActor { self.subject.participantEvent == nil }
     }
 
+    func test_inCall_ringingCallEnds_activeCallRemainsJoined() async throws {
+        // Given
+        await prepare()
+        subject.startCall(callType: callType, callId: callId, members: participants)
+        await assertCallingState(.inCall)
+
+        let newCallId = String.unique
+        let cid = callCid(from: newCallId, callType: .default)
+        // When
+        streamVideo.process(
+            .coordinatorEvent(
+                .typeCallRingEvent(
+                    .init(
+                        call: .dummy(cid: cid),
+                        callCid: cid,
+                        createdAt: .init(),
+                        members: [],
+                        sessionId: .unique,
+                        user: .dummy(),
+                        video: true
+                    )
+                )
+            )
+        )
+        streamVideo.process(
+            .coordinatorEvent(
+                .typeCallEndedEvent(
+                    .init(
+                        call: .dummy(cid: cid),
+                        callCid: cid,
+                        createdAt: .init()
+                    )
+                )
+            )
+        )
+
+        // Then
+        await assertCallingState(.inCall)
+    }
+
     func test_inCall_participantJoinedAndLeft() async throws {
         // Given
         await prepare()
@@ -968,9 +1005,6 @@ final class CallViewModel_Tests: XCTestCase, @unchecked Sendable {
         streamVideo.state.user = firstUser.user
 
         subject = .init()
-        await fulfilmentInMainActor(file: file, line: line) {
-            self.subject.isSubscribedToCallEvents
-        }
     }
 
     private func prepareIncomingCallScenario(
@@ -1110,11 +1144,18 @@ final class CallViewModel_Tests: XCTestCase, @unchecked Sendable {
         if let delay {
             await wait(for: delay)
         }
+        #if compiler(>=6.0)
         await fulfilmentInMainActor(
             "CallViewModel.callingState expected:\(expected) actual: \(subject.callingState)",
             file: file,
             line: line
         ) { self.subject.callingState == expected }
+        #else
+        await fulfilmentInMainActor(
+            file: file,
+            line: line
+        ) { self.subject.callingState == expected }
+        #endif
     }
 }
 
@@ -1138,4 +1179,3 @@ extension User {
 extension Member {
     var userId: String { id }
 }
-#endif