Fix background call (#25)

cloudwebrtc · web-flow · commit 740023e1d5fb · 2020-11-11T12:57:55.000+08:00
* fix background call. * Fix iOS, close #23. * Fix typo. * More changes. * Remove EventChannel. * Change FlutterCallKeep as a singleton. * Add CallKeepPushKitToken event. * Add firebase_messaging to example. * update.
diff --git a/README.md b/README.md
@@ -1,2 +1,3 @@
 # callkeep
-iOS CallKit and Android ConnectionService for Flutter
+* iOS CallKit and Android ConnectionService for Flutter
+* Support FCM and PushKit
diff --git a/android/src/main/java/io/wazo/callkeep/CallKeepModule.java b/android/src/main/java/io/wazo/callkeep/CallKeepModule.java
@@ -217,7 +217,6 @@ public boolean HandleMethodCall(@NonNull MethodCall call, @NonNull Result result
     public void setup(ConstraintsMap options) {
         VoiceConnectionService.setAvailable(false);
         this._settings = options;
-
         if (isConnectionServiceAvailable()) {
             this.registerPhoneAccount();
             this.registerEvents();
@@ -598,7 +597,7 @@ private void registerPhoneAccount(Context appContext) {
     }
 
     private void sendEventToFlutter(String eventName, @Nullable ConstraintsMap params) {
-        _eventChannel.invokeMethod(eventName, params != null? params.toMap() : null);
+        _eventChannel.invokeMethod(eventName, params.toMap());
     }
 
     private String getApplicationName(Context appContext) {
@@ -735,10 +734,10 @@ public void onReceive(Context context, Intent intent) {
                     sendEventToFlutter("CallKeepDidReceiveStartCallAction", args);
                     break;
                 case ACTION_AUDIO_SESSION:
-                    sendEventToFlutter("CallKeepDidActivateAudioSession", null);
+                    sendEventToFlutter("CallKeepDidActivateAudioSession", args);
                     break;
                 case ACTION_CHECK_REACHABILITY:
-                    sendEventToFlutter("CallKeepCheckReachability", null);
+                    sendEventToFlutter("CallKeepCheckReachability", args);
                     break;
                 case ACTION_WAKE_APP:
                     Intent headlessIntent = new Intent(_context, CallKeepBackgroundMessagingService.class);
diff --git a/android/src/main/java/io/wazo/callkeep/VoiceConnectionService.java b/android/src/main/java/io/wazo/callkeep/VoiceConnectionService.java
@@ -56,7 +56,7 @@ public class VoiceConnectionService extends ConnectionService {
     private static Boolean isReachable;
     private static String notReachableCallUuid;
     private static ConnectionRequest currentConnectionRequest;
-    private static PhoneAccountHandle phoneAccountHandle;
+    private static PhoneAccountHandle phoneAccountHandle = null;
     private static String TAG = "RNCK:VoiceConnectionService";
     public static Map<String, VoiceConnection> currentConnections = new HashMap<>();
     public static Boolean hasOutgoingCall = false;
diff --git a/example/.metadata b/example/.metadata
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -22,8 +22,15 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+dependencies {
+  // Add the dependencies for any other desired Firebase products
+  // https://firebase.google.com/docs/android/setup#available-libraries
+  implementation 'com.google.firebase:firebase-messaging:20.3.0'
+}
+
 android {
     compileSdkVersion 28
 
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <!-- END OPTIONAL PERMISSIONS -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name=".Application"
         android:label="flutter_callkeep_example"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/example/android/app/src/main/java/com/github/cloudwebrtc/flutter_callkeep_example/Application.java b/example/android/app/src/main/java/com/github/cloudwebrtc/flutter_callkeep_example/Application.java
@@ -0,0 +1,28 @@
+package com.github.cloudwebrtc.flutter_callkeep_example;
+
+import android.os.Bundle;
+
+import androidx.annotation.CallSuper;
+
+import io.flutter.app.FlutterApplication;
+import io.flutter.app.FlutterActivity;
+import io.flutter.plugin.common.PluginRegistry;
+import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
+import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService;
+import io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin;
+import com.github.cloudwebrtc.flutter_callkeep.FlutterCallkeepPlugin;
+
+public class Application extends FlutterApplication implements PluginRegistrantCallback {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        FlutterFirebaseMessagingService.setPluginRegistrant(this);
+    }
+
+    @Override
+    public void registerWith(PluginRegistry pluginRegistry) {
+        FirebaseMessagingPlugin.registerWith(pluginRegistry.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
+        FlutterCallkeepPlugin.registerWith(pluginRegistry.registrarFor("com.github.cloudwebrtc.flutter_callkeep.FlutterCallkeepPlugin"));
+    }
+}
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -6,6 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.google.gms:google-services:4.3.4'
     }
 }
 
diff --git a/example/ios/Runner/AppDelegate.m b/example/ios/Runner/AppDelegate.m
@@ -6,17 +6,15 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  [GeneratedPluginRegistrant registerWithRegistry:self];
-  // Override point for customization after application launch.
-  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+    [GeneratedPluginRegistrant registerWithRegistry:self];
+    // Override point for customization after application launch.
+    return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
-- (BOOL)application:(UIApplication *)application
-  continueUserActivity:(NSUserActivity *)userActivity
-  restorationHandler:(void(^)(NSArray * __nullable restorableObjects))restorationHandler {
+- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void(^)(NSArray<id<UIUserActivityRestoring>> * __nullable restorableObjects))restorationHandler {
     return [CallKeep application:application
                         continueUserActivity:userActivity
                         restorationHandler:restorationHandler];
-  
 }
+
 @end
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -24,7 +24,6 @@
 	<true/>
 	<key>UIBackgroundModes</key>
 	<array>
-		<string>fetch</string>
 		<string>remote-notification</string>
 		<string>voip</string>
 	</array>
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,10 +1,75 @@
 import 'dart:async';
+import 'dart:io';
 
+import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 
 import 'package:callkeep/callkeep.dart';
 import 'package:uuid/uuid.dart';
 
+/// For fcm background message handler.
+final FlutterCallkeep _callKeep = FlutterCallkeep();
+bool _callKeepInited = false;
+
+Future<dynamic> myBackgroundMessageHandler(Map<String, dynamic> message) {
+  print('backgroundMessage: message => ${message.toString()}');
+
+  var number = message['data']['body'] as String;
+  final callUUID = Uuid().v4();
+  _callKeep.on(CallKeepPerformAnswerCallAction(),
+      (CallKeepPerformAnswerCallAction event) {
+    print(
+        'backgroundMessage: CallKeepPerformAnswerCallAction ${event.callUUID}');
+    _callKeep.startCall(event.callUUID, number, number);
+
+    Timer(const Duration(seconds: 1), () {
+      print('[setCurrentCallActive] $callUUID, number: $number');
+      _callKeep.setCurrentCallActive(callUUID);
+    });
+    //_callKeep.endCall(event.callUUID);
+  });
+
+  _callKeep.on(CallKeepPerformEndCallAction(),
+      (CallKeepPerformEndCallAction event) {
+    print('backgroundMessage: CallKeepPerformEndCallAction ${event.callUUID}');
+  });
+  if (!_callKeepInited) {
+    _callKeep.setup(<String, dynamic>{
+      'ios': {
+        'appName': 'CallKeepDemo',
+      },
+      'android': {
+        'alertTitle': 'Permissions required',
+        'alertDescription':
+            'This application needs to access your phone accounts',
+        'cancelButton': 'Cancel',
+        'okButton': 'ok',
+      },
+    });
+    _callKeepInited = true;
+  }
+
+  print('backgroundMessage: displayIncomingCall ($number)');
+  _callKeep.displayIncomingCall(callUUID, number);
+  _callKeep.backToForeground();
+  /*
+
+  if (message.containsKey('data')) {
+    // Handle data message
+    final dynamic data = message['data'];
+  }
+
+  if (message.containsKey('notification')) {
+    // Handle notification message
+    final dynamic notification = message['notification'];
+    print('notification => ${notification.toString()}');
+  }
+
+  // Or do other work.
+  */
+  return null;
+}
+
 void main() {
   runApp(MyApp());
 }
@@ -35,8 +100,17 @@ class Call {
 class _MyAppState extends State<HomePage> {
   final FlutterCallkeep _callKeep = FlutterCallkeep();
   Map<String, Call> calls = {};
-
   String newUUID() => Uuid().v4();
+  final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
+
+  void iOS_Permission() {
+    _firebaseMessaging.requestNotificationPermissions(
+        IosNotificationSettings(sound: true, badge: true, alert: true));
+    _firebaseMessaging.onIosSettingsRegistered
+        .listen((IosNotificationSettings settings) {
+      print('Settings registered: $settings');
+    });
+  }
 
   void removeCall(String callUUID) {
     setState(() {
@@ -176,9 +250,23 @@ class _MyAppState extends State<HomePage> {
         handleType: 'number', hasVideo: false);
   }
 
+  void didDisplayIncomingCall(CallKeepDidDisplayIncomingCall event) {
+    var callUUID = event.callUUID;
+    var number = event.handle;
+    print('[displayIncomingCall] $callUUID number: $number');
+    setState(() {
+      calls[callUUID] = Call(number);
+    });
+  }
+
+  void onPushKitToken(CallKeepPushKitToken event) {
+    print('[onPushKitToken] token => ${event.token}');
+  }
+
   @override
   void initState() {
     super.initState();
+    _callKeep.on(CallKeepDidDisplayIncomingCall(), didDisplayIncomingCall);
     _callKeep.on(CallKeepPerformAnswerCallAction(), answerCall);
     _callKeep.on(CallKeepDidPerformDTMFAction(), didPerformDTMFAction);
     _callKeep.on(
@@ -187,6 +275,7 @@ class _MyAppState extends State<HomePage> {
     _callKeep.on(
         CallKeepDidPerformSetMutedCallAction(), didPerformSetMutedCallAction);
     _callKeep.on(CallKeepPerformEndCallAction(), endCall);
+    _callKeep.on(CallKeepPushKitToken(), onPushKitToken);
 
     _callKeep.setup(<String, dynamic>{
       'ios': {
@@ -200,6 +289,34 @@ class _MyAppState extends State<HomePage> {
         'okButton': 'ok',
       },
     });
+
+    if (Platform.isAndroid) {
+      //if (isIOS) iOS_Permission();
+      //  _firebaseMessaging.requestNotificationPermissions();
+
+      _firebaseMessaging.getToken().then((token) {
+        print('[FCM] token => ' + token);
+      });
+
+      _firebaseMessaging.configure(
+        onMessage: (Map<String, dynamic> message) async {
+          print('onMessage: $message');
+          if (message.containsKey('data')) {
+            // Handle data message
+            final dynamic data = message['data'];
+            var number = data['body'] as String;
+            await displayIncomingCall(number);
+          }
+        },
+        onBackgroundMessage: myBackgroundMessageHandler,
+        onLaunch: (Map<String, dynamic> message) async {
+          print('onLaunch: $message');
+        },
+        onResume: (Map<String, dynamic> message) async {
+          print('onResume: $message');
+        },
+      );
+    }
   }
 
   Widget buildCallingWidgets() {
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,5 +1,6 @@
 name: flutter_callkeep_example
 description: Demonstrates how to use the flutter_callkeep plugin.
+version: 0.1.1
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `pub publish`. This is preferred for private packages.
@@ -24,6 +25,8 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.0
   uuid: ^2.0.2
+  firebase_messaging: ^7.0.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/ios/Classes/CallKeep.h b/ios/Classes/CallKeep.h
@@ -10,45 +10,43 @@
 #import <UIKit/UIKit.h>
 #import <CallKit/CallKit.h>
 #import <Intents/Intents.h>
-//#import <AVFoundation/AVAudioSession.h>
+#import <PushKit/PushKit.h>
 
-@interface CallKeep: NSObject<FlutterStreamHandler, CXProviderDelegate>
+@interface CallKeep: NSObject<CXProviderDelegate, PKPushRegistryDelegate>
+@property (nonatomic, strong, nullable) CXCallController *callKeepCallController;
+@property (nonatomic, strong, nullable) CXProvider *callKeepProvider;
+@property (nonatomic, strong, nullable) FlutterMethodChannel* eventChannel;
 
-@property (nonatomic, strong) FlutterMethodChannel* eventChannel;
-@property (nonatomic, strong) CXCallController *callKeepCallController;
-@property (nonatomic, strong) CXProvider *callKeepProvider;
+- (BOOL)handleMethodCall:(FlutterMethodCall* _Nonnull)call result:(FlutterResult _Nonnull )result;
 
++ (BOOL)application:(UIApplication * _Nonnull)application
+            openURL:(NSURL * _Nonnull)url
+            options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> * _Nonnull)options NS_AVAILABLE_IOS(9_0);
 
-- (BOOL)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result;
++ (BOOL)application:(UIApplication * _Nonnull)application
+continueUserActivity:(NSUserActivity * _Nonnull)userActivity
+  restorationHandler:(void(^ _Nonnull)(NSArray<id<UIUserActivityRestoring>> * __nullable restorableObjects))restorationHandler;
 
-+ (BOOL)application:(UIApplication *)application
-            openURL:(NSURL *)url
-            options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options NS_AVAILABLE_IOS(9_0);
-
-+ (BOOL)application:(UIApplication *)application
-continueUserActivity:(NSUserActivity *)userActivity
-  restorationHandler:(void(^)(NSArray<id<UIUserActivityRestoring>> * __nullable restorableObjects))restorationHandler;
-
-+ (void)reportNewIncomingCall:(NSString *)uuidString
-                       handle:(NSString *)handle
-                   handleType:(NSString *)handleType
++ (void)reportNewIncomingCall:(NSString * _Nonnull)uuidString
+                       handle:(NSString * _Nonnull)handle
+                   handleType:(NSString * _Nonnull)handleType
                      hasVideo:(BOOL)hasVideo
           localizedCallerName:(NSString * _Nullable)localizedCallerName
                   fromPushKit:(BOOL)fromPushKit
                       payload:(NSDictionary * _Nullable)payload;
 
-+ (void)reportNewIncomingCall:(NSString *)uuidString
-                       handle:(NSString *)handle
-                   handleType:(NSString *)handleType
++ (void)reportNewIncomingCall:(NSString * _Nonnull)uuidString
+                       handle:(NSString * _Nonnull)handle
+                   handleType:(NSString * _Nonnull)handleType
                      hasVideo:(BOOL)hasVideo
           localizedCallerName:(NSString * _Nullable)localizedCallerName
                   fromPushKit:(BOOL)fromPushKit
                       payload:(NSDictionary * _Nullable)payload
         withCompletionHandler:(void (^_Nullable)(void))completion;
 
-+ (void)endCallWithUUID:(NSString *)uuidString
++ (void)endCallWithUUID:(NSString * _Nonnull)uuidString
                  reason:(int)reason;
 
-+ (BOOL)isCallActive:(NSString *)uuidString;
++ (BOOL)isCallActive:(NSString * _Nonnull)uuidString;
 
 @end
diff --git a/ios/Classes/CallKeep.m b/ios/Classes/CallKeep.m
diff --git a/ios/Classes/FlutterCallkeepPlugin.h b/ios/Classes/FlutterCallkeepPlugin.h
diff --git a/lib/src/actions.dart b/lib/src/actions.dart
diff --git a/lib/src/api.dart b/lib/src/api.dart

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ buildscript {`
`6`	`6`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath 'com.android.tools.build:gradle:3.5.0'`
	`9`	`+ classpath 'com.google.gms:google-services:4.3.4'`
`9`	`10`	`}`
`10`	`11`	`}`
`11`	`12`