fixes for ringing on iOS terminated state (#750)

Author: Brazol

dogfooding/lib/app/app_content.dart

@@ -109,12 +109,14 @@ class _StreamDogFoodingAppContentState
   }
 
   Future<void> _consumeIncomingCall() async {
-    final calls =
-        await StreamVideo.instance.pushNotificationManager?.activeCalls();
+    if (!locator.isRegistered<StreamVideo>()) return;
+
+    final streamVideo = locator.get<StreamVideo>();
+    final calls = await streamVideo.pushNotificationManager?.activeCalls();
 
     if (calls == null || calls.isEmpty) return;
 
-    final callResult = await StreamVideo.instance.consumeIncomingCall(
+    final callResult = await streamVideo.consumeIncomingCall(
       uuid: calls.first.uuid!,
       cid: calls.first.callCid!,
     );

dogfooding/lib/screens/home_screen.dart

@@ -65,6 +65,7 @@ class _HomeScreenState extends State<HomeScreen> {
       await _call!.getOrCreate(
         memberIds: memberIds,
         ringing: isRinging,
+        video: true,
       );
     } catch (e, stk) {
       debugPrint('Error joining or creating call: $e');

packages/stream_video/lib/src/call/call.dart

@@ -403,24 +403,27 @@ class Call {
 
   Future<Result<None>> accept() async {
     final state = this.state.value;
-    _logger.i(() => '[reject] ${_status.value}; state: $state');
+    _logger.i(() => '[accept] ${_status.value}; state: $state');
+
     final status = state.status;
     if (status is! CallStatusIncoming || status.acceptedByMe) {
-      _logger.w(() => '[acceptCall] rejected (invalid status): $status');
+      _logger.w(() => '[accept] rejected (invalid status): $status');
       return Result.error('invalid status: $status');
     }
 
     final outgoingCall = _getOutgoingCall();
-    if (outgoingCall?.callCid != callCid) {
-      await outgoingCall?.reject(reason: CallRejectReason.cancel());
-      await outgoingCall?.leave();
+    if (outgoingCall != null && outgoingCall.callCid != callCid) {
+      _logger.i(() => '[accept] canceling outgoing call: $outgoingCall');
+      await outgoingCall.reject(reason: CallRejectReason.cancel());
+      await outgoingCall.leave();
       await _setOutgoingCall(null);
     }
 
     final activeCall = _getActiveCall();
-    if (activeCall?.callCid != callCid) {
-      await activeCall?.reject(reason: CallRejectReason.cancel());
-      await activeCall?.leave();
+    if (activeCall != null && activeCall.callCid != callCid) {
+      _logger.i(() => '[accept] canceling another active call: $activeCall');
+      await activeCall.reject(reason: CallRejectReason.cancel());
+      await activeCall.leave();
       await _setActiveCall(null);
     }
 

packages/stream_video/lib/src/call/session/call_session.dart

@@ -115,11 +115,7 @@ class CallSession extends Disposable {
       sfu_models.Device? device;
       sfu_models.Browser? browser;
 
-      var os = sfu_models.OS(
-        name: SysInfo.operatingSystemName,
-        version: SysInfo.operatingSystemVersion,
-        architecture: SysInfo.rawKernelArchitecture,
-      );
+      var os = sfu_models.OS();
 
       if (CurrentPlatform.isAndroid) {
         final deviceInfo = await DeviceInfoPlugin().androidInfo;

packages/stream_video_push_notification/ios/Classes/StreamVideoPKDelegateManager.swift

@@ -129,11 +129,7 @@ public class StreamVideoPKDelegateManager: NSObject, PKPushRegistryDelegate, UNU
             fromPushKit: true
         )
 
-        // Complete after a delay to ensure that the incoming call notification
-        // is displayed before completing the push notification handling.
-       DispatchQueue.main.asyncAfter(deadline: .now() + 5) {
-           completion()
-       }
+        completion()
     }
 
 }

packages/stream_video_push_notification/lib/src/stream_video_push_notification.dart

@@ -78,17 +78,7 @@ class StreamVideoPushNotificationManager implements PushNotificationManager {
         _idCallRejected,
         client.events.on<CoordinatorCallRejectedEvent>(
           (event) async {
-            final callRingingState = await streamVideo.getCallRingingState(
-                callType: event.callCid.type, id: event.callCid.id);
-
-            switch (callRingingState) {
-              case CallRingingState.accepted:
-              case CallRingingState.rejected:
-              case CallRingingState.ended:
-                endCallByCid(event.callCid.toString());
-              case CallRingingState.ringing:
-                break;
-            }
+            endCallByCid(event.callCid.toString());
           },
         ),
       );
@@ -97,19 +87,9 @@ class StreamVideoPushNotificationManager implements PushNotificationManager {
         _idCallAccepted,
         client.events.on<CoordinatorCallAcceptedEvent>(
           (event) async {
-            final callRingingState = await streamVideo.getCallRingingState(
-                callType: event.callCid.type, id: event.callCid.id);
-
-            switch (callRingingState) {
-              case CallRingingState.accepted:
-              case CallRingingState.rejected:
-              case CallRingingState.ended:
-                await FlutterCallkitIncoming.silenceEvents();
-                await endCallByCid(event.callCid.toString());
-                await Future<void>.delayed(const Duration(milliseconds: 300));
-                await FlutterCallkitIncoming.unsilenceEvents();
-              case CallRingingState.ringing:
-                break;
+            if (streamVideo.activeCall?.state.value.status
+                is! CallStatusActive) {
+              await endCallByCid(event.callCid.toString());
             }
           },
         ),