Merge branch 'staging' into main

Author: rohit-ramkumar

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.0 (28/07/2021)
+
+### Enhancements
+* Added support for null safety
+* Upgraded Freshchat iOS SDK version to 4.2.0
+
 ## 0.7.0 (19/06/2021)
 
 ### Enhancements

example/android/app/build.gradle

@@ -50,7 +50,7 @@ android {
     }
 
     dependencies {
-        implementation 'com.google.firebase:firebase-messaging:20.1.0'
+        implementation 'com.google.firebase:firebase-messaging:22.0.0'
     }
 }
 flutter {

example/android/app/google-services.json

@@ -1,26 +1,25 @@
 package com.fc.sampleobjc.flutter_app;
 
 import com.freshchat.consumer.sdk.flutter.FreshchatSdkPlugin;
-import com.google.firebase.FirebaseApp;
 
 import io.flutter.app.FlutterApplication;
 import io.flutter.embedding.engine.FlutterEngine;
 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 io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingPlugin;
+import io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingBackgroundService;
 
 public class ExampleApplication extends FlutterApplication implements PluginRegistrantCallback {
     @Override
     public void onCreate() {
         super.onCreate();
-        FlutterFirebaseMessagingService.setPluginRegistrant(this);
+        FlutterFirebaseMessagingBackgroundService.setPluginRegistrant(this);
     }
 
     @Override
     public void registerWith(PluginRegistry registry) {
-        FirebaseMessagingPlugin.registerWith(registry.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
+        FlutterFirebaseMessagingPlugin.registerWith(registry.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
         FreshchatSdkPlugin.register(registry);
     }
 }

example/android/app/src/main/java/com/fc/sampleobjc/flutter_app/ExampleApplication.java

@@ -0,0 +1,22 @@
+package com.fc.sampleobjc.flutter_app;
+
+import com.freshchat.consumer.sdk.flutter.FreshchatSdkPlugin
+import io.flutter.app.FlutterApplication
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.PluginRegistry
+import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
+import io.flutter.plugins.GeneratedPluginRegistrant
+import io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingPlugin
+import io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingBackgroundService
+class ExampleApplicationKotlin : FlutterApplication(), PluginRegistrantCallback {
+    @Override
+    fun onCreate() {
+        super.onCreate()
+        FlutterFirebaseMessagingBackgroundService.setPluginRegistrant(this)
+    }
+    @Override
+    fun registerWith(registry: PluginRegistry) {
+        FlutterFirebaseMessagingPlugin.registerWith(registry.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"))
+        FreshchatSdkPlugin.register(registry)
+    }
+}

example/android/app/src/main/java/com/fc/sampleobjc/flutter_app/ExampleApplicationKotlin.kt

@@ -1,42 +1,55 @@
 import UIKit
 import Flutter
 import UserNotifications
-
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
-    override func application(
-        _ application: UIApplication,
-        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-    ) -> Bool {
-        GeneratedPluginRegistrant.register(with: self)
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
+    GeneratedPluginRegistrant.register(with: self)
+    if #available(iOS 10.0, *) {
         UNUserNotificationCenter.current().delegate = self
+    } else {
+        // Fallback on earlier versions
+    }
+    if #available(iOS 10.0, *) {
         UNUserNotificationCenter.current().requestAuthorization(options:[.badge, .alert, .sound]){ (granted, error) in
             print("grant: \(granted)")
         }
-        UIApplication.shared.registerForRemoteNotifications()
-        return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    } else {
+        // Fallback on earlier versions
     }
-}
-
-func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
-    let freshchatSdkPlugin = FreshchatSdkPlugin()
-    print("Device Token \(deviceToken)")
-    print("Device token is set")
-    freshchatSdkPlugin.setPushRegistrationToken(deviceToken)
-}
-
-func application(application: UIApplication,  didReceiveRemoteNotification userInfo: [NSObject : AnyObject],  fetchCompletionHandler completionHandler: (UIBackgroundFetchResult) -> Void) {
-    let freshchatSdkPlugin = FreshchatSdkPlugin()
-    if freshchatSdkPlugin.isFreshchatNotification(userInfo){
-        NSLog("is Freshchat Notification")
-        freshchatSdkPlugin.handlePushNotification(userInfo)
-    }else{
-        NSLog("Not Freshchat Notification")
+            UIApplication.shared.registerForRemoteNotifications()
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+    override func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+        let freshchatSdkPlugin = FreshchatSdkPlugin()
+        print("Device Token \(deviceToken)")
+        print("Device token is set")
+        freshchatSdkPlugin.setPushRegistrationToken(deviceToken)
+    }
+    //@available(iOS 10.0, *)
+    override func userNotificationCenter(_ center: UNUserNotificationCenter,
+            willPresent: UNNotification,
+            withCompletionHandler: @escaping (UNNotificationPresentationOptions)->()) {
+        let freshchatSdkPlugin = FreshchatSdkPlugin()
+    if freshchatSdkPlugin.isFreshchatNotification(willPresent.request.content.userInfo) {
+        freshchatSdkPlugin.handlePushNotification(willPresent.request.content.userInfo) //Handled for freshchat notifications
+    } else {
+        withCompletionHandler([.alert, .sound, .badge]) //For other notifications
+         }
+    }
+    //@available(iOS 10.0, *)
+    override func userNotificationCenter(_ center: UNUserNotificationCenter,
+                              didReceive: UNNotificationResponse,
+                              withCompletionHandler: @escaping ()->()) {
+        let freshchatSdkPlugin = FreshchatSdkPlugin()
+    if freshchatSdkPlugin.isFreshchatNotification(didReceive.notification.request.content.userInfo) {
+        freshchatSdkPlugin.handlePushNotification(didReceive.notification.request.content.userInfo) //Handled for freshchat notifications
+           withCompletionHandler()
+    } else {
+           withCompletionHandler() //For other notifications
+        }
     }
-    completionHandler(.newData)
-}
-
-func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
-    print("Failed to register for notifications: \(error.localizedDescription)")
 }
-