@dashx/react-native 0.1.19 → 0.1.20

package/DashX.podspec

@@ -23,8 +23,5 @@ Pod::Spec.new do |s|
 
   s.dependency "React"
   s.dependency "Apollo"
-  s.dependency "FirebaseInstanceID"
-  s.dependency "Firebase/Messaging"
-  # ...
-  # s.dependency "..."
+  s.dependency "FirebaseMessaging"
 end

package/README.md

@@ -49,15 +49,19 @@ apply plugin: 'com.google.gms.google-services'
 
 ### Setup for iOS
 
-- At the top of the file `/ios/{projectName}/AppDelegate.m` import Firebase:
+- At the top of the file `/ios/{projectName}/AppDelegate.m` before [#if defined(FB_SONARKIT_ENABLED)](https://github.com/react-native-camera/react-native-camera/issues/3008#issuecomment-726432198), import Firebase:
 
 ```objective-c
-#import <Firebase.h>
+#import <FirebaseCore/FirebaseCore.h>
+#import <FirebaseMessaging/FirebaseMessaging.h>
 ```
 
 - In the same file, inside your `didFinishLaunchingWithOptions` add this:
 
 ```objective-c
+// Register for remote notifications. This shows a permission dialog on first run, to
+// show the dialog at a more appropriate time move this registration accordingly.
+// [START register_for_notifications]
 [UNUserNotificationCenter currentNotificationCenter].delegate = self;
 UNAuthorizationOptions authOptions = UNAuthorizationOptionAlert |
     UNAuthorizationOptionSound | UNAuthorizationOptionBadge;
@@ -67,18 +71,23 @@ UNAuthorizationOptions authOptions = UNAuthorizationOptionAlert |
     }];
 
 [application registerForRemoteNotifications];
+// [END register_for_notifications]
 
+// [START configure_firebase]
 if ([FIRApp defaultApp] == nil) {
   [FIRApp configure];
 }
+// [END configure_firebase]
 
+// [START set_messaging_delegate]
 [FIRMessaging messaging].delegate = self;
+// [END set_messaging_delegate]
 ```
 
 - In your `Podfile` add this:
 
 ```ruby
-pod 'FirebaseInstanceID', :modular_headers => true
+pod 'FirebaseMessaging', :modular_headers => true
 ```
 
 - Add your iOS app on Firebase Console: `Project Overview > Add App > iOS`

package/ios/DashX.swift

@@ -1,5 +1,5 @@
 import Foundation
-import FirebaseInstanceID
+import FirebaseMessaging
 
 @objc(DashX)
 class DashX: RCTEventEmitter {
@@ -45,12 +45,13 @@ class DashX: RCTEventEmitter {
             UIViewController.swizzle()
         }
 
-        InstanceID.instanceID().instanceID { (result, error) in
+        // Based on https://firebase.google.com/docs/cloud-messaging/ios/client#access_the_registration_token
+        Messaging.messaging().token { token, error in
             if let error = error {
-                DashXLog.d(tag: #function, "Error fetching remote instance ID: \(error)")
-            } else if let result = result {
-                DashXLog.d(tag: #function, "Firebase initialised with: \(result.token)")
-                self.dashXClient.setDeviceToken(to: result.token)
+                DashXLog.d(tag: #function, "Error fetching FCM registration token: \(error)")
+            } else if let token = token {
+                DashXLog.d(tag: #function, "Firebase initialised with: \(token)")
+                self.dashXClient.setDeviceToken(to: token)
             }
         }
     }
@@ -145,5 +146,4 @@ class DashX: RCTEventEmitter {
     func subscribe() {
         dashXClient.subscribe()
     }
-
 }

package/ios/DashXAppDelegate.swift

@@ -3,22 +3,26 @@ import Foundation
 @objc(DashXAppDelegate)
 class DashXAppDelegate: NSObject {
     static func swizzleDidReceiveRemoteNotificationFetchCompletionHandler() {
-        let appDelegate = UIApplication.shared.delegate
-        let appDelegateClass: AnyClass? = object_getClass(appDelegate)
+        // To remove the warning -[UIApplication delegate] must be called from main thread only
+        // and to call the UI controlling method from the main thread, use `DispatchQueue.main.async`
+        DispatchQueue.main.async {
+            let appDelegate = UIApplication.shared.delegate
+            let appDelegateClass: AnyClass? = object_getClass(appDelegate)
 
-        let originalSelector = #selector(UIApplicationDelegate.application(_:didReceiveRemoteNotification:fetchCompletionHandler:))
-        let swizzledSelector = #selector(DashXAppDelegate.self.handleMessage(_:didReceiveRemoteNotification:fetchCompletionHandler:))
+            let originalSelector = #selector(UIApplicationDelegate.application(_:didReceiveRemoteNotification:fetchCompletionHandler:))
+            let swizzledSelector = #selector(DashXAppDelegate.self.handleMessage(_:didReceiveRemoteNotification:fetchCompletionHandler:))
 
-        guard let swizzledMethod = class_getInstanceMethod(DashXAppDelegate.self, swizzledSelector) else {
-            return
-        }
+            guard let swizzledMethod = class_getInstanceMethod(DashXAppDelegate.self, swizzledSelector) else {
+                return
+            }
 
-        if let originalMethod = class_getInstanceMethod(appDelegateClass, originalSelector)  {
-            // exchange implementation
-            method_exchangeImplementations(originalMethod, swizzledMethod)
-        } else {
-            // add implementation
-            class_addMethod(appDelegateClass, swizzledSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod))
+            if let originalMethod = class_getInstanceMethod(appDelegateClass, originalSelector)  {
+                // exchange implementation
+                method_exchangeImplementations(originalMethod, swizzledMethod)
+            } else {
+                // add implementation
+                class_addMethod(appDelegateClass, swizzledSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod))
+            }
         }
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [