fix: push notification cancelation (#554)

* fixes push notification cancelation

* minor fixes for pub scoreing

* tweaks

Author: Brazol

packages/stream_video/example/lib/main.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:stream_video/stream_video.dart';
+
+Future<void> main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  StreamVideo.create(
+    'api_token',
+    user: User.guest(userId: 'user_id'),
+  );
+}

packages/stream_video/lib/src/stream_video.dart

@@ -572,13 +572,18 @@ class StreamVideo {
     final callCid = payload['call_cid'] as String?;
     if (callCid == null) return false;
 
-    final uuid = const Uuid().v4();
+    var callId = const Uuid().v4();
+    final splitCid = callCid.split(':');
+    if (splitCid.length == 2) {
+      callId = splitCid.last;
+    }
+
     final createdById = payload['created_by_id'] as String?;
     final createdByName = payload['created_by_display_name'] as String?;
 
     unawaited(
       manager.showIncomingCall(
-        uuid: uuid,
+        uuid: callId,
         handle: createdById,
         nameCaller: createdByName,
         callCid: callCid,

packages/stream_video/pubspec.yaml

@@ -12,8 +12,8 @@ environment:
 
 dependencies:
   async: ^2.11.0
-  collection: ^1.17.1
-  connectivity_plus: ^4.0.2
+  collection: ^1.18.0
+  connectivity_plus: ^5.0.2
   dart_webrtc: ^1.1.3
   equatable: ^2.0.5
   fixnum: ^1.1.0
@@ -22,7 +22,7 @@ dependencies:
   flutter_webrtc: ^0.9.47
   http: ^1.1.0
   internet_connection_checker: ^1.0.0+1
-  intl: ^0.18.1
+  intl: ^0.19.0
   jose: ^0.3.4
   meta: ^1.9.1
   protobuf: ^3.1.0
@@ -31,7 +31,7 @@ dependencies:
   state_notifier: ^1.0.0
   synchronized: ^3.1.0
   tart: ^0.5.1
-  uuid: ^3.0.7
+  uuid: ^4.2.1
   web_socket_channel: ^2.4.0
   webrtc_interface: ^1.1.1
 

packages/stream_video_flutter/example/pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   flutter_webrtc: ^0.9.47
   google_fonts: ^5.1.0
   http: ^1.1.0
-  intl: ^0.18.1
+  intl: ^0.19.0
   path_provider: ^2.1.0
   share_plus: ^7.1.0
   stream_video: ^0.3.1

packages/stream_video_flutter/lib/src/theme/call_content_theme.dart

@@ -102,8 +102,8 @@ class StreamCallContentTheme extends InheritedWidget {
   static StreamCallContentThemeData incomingCallThemeOf(
     BuildContext context,
   ) {
-    final incomingOutgoingCallTheme = context
-        .dependOnInheritedWidgetOfExactType<StreamCallContentTheme>();
+    final incomingOutgoingCallTheme =
+        context.dependOnInheritedWidgetOfExactType<StreamCallContentTheme>();
     return incomingOutgoingCallTheme?.data ??
         StreamVideoTheme.of(context).callContentTheme;
   }

packages/stream_video_push_notification/ios/Classes/StreamVideoPKDelegateManager.swift

@@ -67,6 +67,15 @@ public class StreamVideoPKDelegateManager: NSObject, PKPushRegistryDelegate {
         let callCid = streamDict?["call_cid"] as? String ?? ""
         var createdByName = streamDict?["created_by_display_name"] as? String
         var createdById = streamDict?["created_by_id"] as? String
+
+        let splitCid = callCid.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true)
+        var callId = UUID().uuidString;
+        var callType = "";
+
+        if splitCid.count == 2 {
+            let callType = String(splitCid[0])
+            let callId = String(splitCid[1])
+        } 
 
         let data: StreamVideoPushParams
         if let jsonData = self.defaultData {
@@ -75,7 +84,7 @@ public class StreamVideoPKDelegateManager: NSObject, PKPushRegistryDelegate {
             data = StreamVideoPushParams(args: [String: Any]())
         }
 
-        data.callKitData.uuid = UUID().uuidString
+        data.callKitData.uuid = callId
         data.callKitData.nameCaller = createdByName ?? defaultCallText
         data.callKitData.handle = createdById ?? defaultCallText
         data.callKitData.type = 1 //video

packages/stream_video_push_notification/lib/src/stream_video_push_notification.dart

@@ -13,9 +13,10 @@ import 'stream_video_push_params.dart';
 part 'stream_video_push_provider.dart';
 
 const _idToken = 1;
-const _idCallIncoming = 2;
+const _idCallKitIncoming = 2;
 const _idCallEnded = 3;
-const _idCallAcceptDecline = 4;
+const _idCallAccepted = 4;
+const _idCallKitAcceptDecline = 5;
 
 /// Implementation of [PushNotificationManager] for Stream Video.
 class StreamVideoPushNotificationManager implements PushNotificationManager {
@@ -54,14 +55,26 @@ class StreamVideoPushNotificationManager implements PushNotificationManager {
     this.callerCustomizationCallback,
   }) : _client = client {
     _subscriptions.add(
-      _idCallIncoming,
+      _idCallKitIncoming,
       onCallEvent.whereType<ActionCallIncoming>().listen(
         (_) {
           _subscriptions.add(
             _idCallEnded,
             client.events.on<CoordinatorCallEndedEvent>(
-              (_) {
-                endAllCalls();
+              (event) {
+                FlutterCallkitIncoming.endCall(event.callCid.id);
+              },
+            ),
+          );
+
+          _subscriptions.add(
+            _idCallAccepted,
+            client.events.on<CoordinatorCallAcceptedEvent>(
+              (event) async {
+                await FlutterCallkitIncoming.silenceEvents();
+                await FlutterCallkitIncoming.endCall(event.callCid.id);
+                await Future<void>.delayed(const Duration(milliseconds: 300));
+                await FlutterCallkitIncoming.unsilenceEvents();
               },
             ),
           );
@@ -70,10 +83,13 @@ class StreamVideoPushNotificationManager implements PushNotificationManager {
     );
 
     _subscriptions.add(
-      _idCallAcceptDecline,
-      onCallEvent.whereType<ActionCallAccept>().map((_) => null).mergeWith(
-          [onCallEvent.whereType<ActionCallDecline>().map((_) => null)]).listen(
+      _idCallKitAcceptDecline,
+      onCallEvent.whereType<ActionCallAccept>().map((_) => null).mergeWith([
+        onCallEvent.whereType<ActionCallDecline>().map((_) => null),
+        onCallEvent.whereType<ActionCallTimeout>().map((_) => null),
+      ]).listen(
         (_) {
+          _subscriptions.cancel(_idCallAccepted);
           _subscriptions.cancel(_idCallEnded);
         },
       ),

packages/stream_video_push_notification/pubspec.yaml

@@ -16,21 +16,21 @@ dependencies:
   firebase_messaging: ^14.6.6
   flutter:
     sdk: flutter
-  flutter_callkit_incoming: ^2.0.0+2
+  flutter_callkit_incoming: ^2.0.1+1
+  json_annotation: ^4.8.0
   meta: ^1.9.1
   plugin_platform_interface: ^2.1.6
   rxdart: ^0.27.7
   stream_video: ^0.3.1
-  uuid: ^3.0.7
-  json_annotation: ^4.8.0
+  uuid: ^4.2.1
 
 dev_dependencies:
   build_runner: ^2.4.4
   flutter_lints: ^2.0.2
   flutter_test:
     sdk: flutter
-  mocktail: ^1.0.0
   json_serializable: ^6.6.1
+  mocktail: ^1.0.0
 
 flutter:
   # This section identifies this Flutter project as a plugin project.