@dashx/react-native 0.1.12 → 0.1.13

package/android/build.gradle

@@ -97,8 +97,12 @@ dependencies {
 
   implementation 'com.google.code.gson:gson:2.8.6'
 
-  compileOnly 'com.google.firebase:firebase-core:17.2.1'
-  compileOnly 'com.google.firebase:firebase-messaging:20.0.1'
+  // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
+  implementation platform('com.google.firebase:firebase-bom:28.3.0')
+  implementation 'com.google.firebase:firebase-messaging-ktx'
+
+  // The Firebase SDK for Google Analytics is needed for delivery reports
+  implementation 'com.google.firebase:firebase-analytics-ktx'
 }
 
 def configureReactNativePom(def pom) {

package/android/src/main/AndroidManifest.xml

@@ -2,9 +2,9 @@
           package="com.dashx.rn.sdk">
 
   <application>
-    <service android:name="com.dashx.rn.sdk.DashXMessagingService">
-      <intent-filter android:priority="1">
-        <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+    <service android:name=".DashXMessagingService" android:exported="false">
+      <intent-filter>
+        <action android:name="com.google.firebase.MESSAGING_EVENT" />
       </intent-filter>
     </service>
   </application>

package/android/src/main/java/com/dashx/rn/sdk/DashXActivityLifecycleCallbacks.kt

@@ -12,7 +12,7 @@ class DashXActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
     private var startSession = System.currentTimeMillis().toDouble()
 
     init {
-        dashXClient.trackAppStarted()
+        dashXClient?.trackAppStarted()
     }
 
     override fun onActivityPaused(activity: Activity) {
@@ -20,7 +20,7 @@ class DashXActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
             return
         }
 
-        dashXClient.trackAppSession(System.currentTimeMillis().toDouble() - startSession)
+        dashXClient?.trackAppSession(System.currentTimeMillis().toDouble() - startSession)
     }
 
     override fun onActivityResumed(activity: Activity) {
@@ -29,7 +29,7 @@ class DashXActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
         }
 
         startSession = System.currentTimeMillis().toDouble()
-        dashXClient.trackAppStarted(fromBackground = true)
+        dashXClient?.trackAppStarted(fromBackground = true)
     }
 
     override fun onActivityStarted(activity: Activity) {
@@ -37,10 +37,10 @@ class DashXActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
             return
         }
 
-        val packageManager = activity?.packageManager
+        val packageManager = activity.packageManager
         val info = packageManager?.getActivityInfo(activity.componentName, PackageManager.GET_META_DATA)
         val activityLabel = info?.loadLabel(packageManager)
-        activityLabel?.let { it -> dashXClient.screen(it.toString(), hashMapOf()) }
+        activityLabel?.let { it -> dashXClient?.screen(it.toString(), hashMapOf()) }
     }
 
     override fun onActivityDestroyed(activity: Activity) {

package/android/src/main/java/com/dashx/rn/sdk/DashXClientInterceptor.kt

@@ -16,35 +16,37 @@ class DashXClientInterceptor private constructor() {
 
     fun createDashXClient(reactApplicationContext: ReactApplicationContext, publicKey: String, baseURI: String?, targetEnvironment: String?, targetInstallation: String?) {
         this.reactApplicationContext = reactApplicationContext
-        client = DashX(reactApplicationContext.applicationContext, publicKey!!, baseURI, targetEnvironment, targetInstallation)
+        client = DashX(reactApplicationContext.applicationContext, publicKey, baseURI, targetEnvironment, targetInstallation)
     }
 
-    fun getDashXClient(): com.dashx.sdk.DashXClient {
-        if (client == null) {
-            throw Exception("DashXClient not initialised")
-        }
-
-        return client!!
+    fun getDashXClient(): com.dashx.sdk.DashXClient? {
+        return client
     }
 
     fun handleMessage(remoteMessage: RemoteMessage) {
-        val notification = remoteMessage.notification
+        val notificationData = remoteMessage.getData()
+
+        DashXLog.d(tag, "Notification Data: " + notificationData)
+
         val eventProperties: WritableMap = Arguments.createMap()
-        DashXLog.d(tag, "Data: " + remoteMessage.data)
 
         try {
-            eventProperties.putMap("data", convertToWritableMap(remoteMessage.data, listOf(dashXNotificationFilter)))
+            eventProperties.putMap("data", convertToWritableMap(notificationData, listOf(dashXNotificationFilter)))
         } catch (e: Exception) {
-            DashXLog.d(tag, "Encountered an error while parsing notification data")
             e.printStackTrace()
+            DashXLog.d(tag, "Encountered an error while parsing notification data.")
         }
 
+        val notification = remoteMessage.getNotification()
+
         if (notification != null) {
             val notificationProperties: WritableMap = Arguments.createMap()
-            notificationProperties.putString("title", notification.title)
-            notificationProperties.putString("body", notification.body)
+            notificationProperties.putString("title", notification.getTitle())
+            notificationProperties.putString("body", notification.getBody())
+
             eventProperties.putMap("notification", notificationProperties)
-            DashXLog.d(tag, "onMessageReceived: " + notification.title)
+
+            DashXLog.d(tag, "onMessageReceived with Title: " + notification.getTitle() + " and Body: " + notification.getBody())
         }
 
         sendJsEvent("messageReceived", eventProperties)

package/android/src/main/java/com/dashx/rn/sdk/DashXExceptionHandler.kt

@@ -11,13 +11,18 @@ class DashXExceptionHandler(private val mainExceptionHandler: Thread.UncaughtExc
                 return
             }
 
-            val dashXExceptionHandler = DashXExceptionHandler(defaultExceptionHandler)
-            Thread.setDefaultUncaughtExceptionHandler(dashXExceptionHandler)
+            if (defaultExceptionHandler != null) {
+                val dashXExceptionHandler = DashXExceptionHandler(defaultExceptionHandler)
+                Thread.setDefaultUncaughtExceptionHandler(dashXExceptionHandler)
+            }
         }
     }
 
     override fun uncaughtException(thread: Thread, exception: Throwable) {
-        dashXClient.trackAppCrashed(exception)
+        if (dashXClient != null) {
+            dashXClient.trackAppCrashed(exception)
+        }
+
         mainExceptionHandler.uncaughtException(thread, exception)
     }
 }

package/android/src/main/java/com/dashx/rn/sdk/DashXMessagingService.kt

@@ -10,8 +10,11 @@ class DashXMessagingService : FirebaseMessagingService() {
 
     override fun onNewToken(token: String) {
         super.onNewToken(token)
-        dashXClient.setDeviceToken(token)
         DashXLog.d(tag, "onNewToken: $token")
+
+        if (dashXClient != null) {
+            dashXClient.setDeviceToken(token)
+        }
     }
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {

package/android/src/main/java/com/dashx/rn/sdk/DashXModule.kt

@@ -3,7 +3,7 @@ package com.dashx.rn.sdk
 import com.facebook.react.bridge.*
 import com.dashx.sdk.DashXLog
 import com.google.android.gms.tasks.OnCompleteListener
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
 
 class DashXModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     private val tag = DashXModule::class.java.simpleName
@@ -28,7 +28,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             options.getStringIfPresent("targetEnvironment"),
             options.getStringIfPresent("targetInstallation")
         )
-        interceptor.getDashXClient().generateAnonymousUid()
+        interceptor.getDashXClient()?.generateAnonymousUid()
 
         if (options.hasKey("trackAppLifecycleEvents") && options.getBoolean("trackAppLifecycleEvents")) {
             DashXExceptionHandler.enable()
@@ -39,28 +39,28 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             DashXActivityLifecycleCallbacks.enableScreenTracking(reactContext.applicationContext)
         }
 
-        FirebaseInstanceId.getInstance().instanceId
+        FirebaseMessaging.getInstance().getToken()
             .addOnCompleteListener(OnCompleteListener { task ->
                 if (!task.isSuccessful) {
-                    DashXLog.d(tag, "getInstanceId failed $task.exception")
+                    DashXLog.d(tag, "FirebaseMessaging.getInstance().getToken() failed: $task.exception")
                     return@OnCompleteListener
                 }
 
-                val token = task.result?.token
-                token?.let { it -> interceptor.getDashXClient().setDeviceToken(it) }
+                val token = task.getResult()
+                token?.let { it -> interceptor.getDashXClient()?.setDeviceToken(it) }
                 DashXLog.d(tag, "Firebase Initialised with: $token")
-            })
+            });
     }
 
     @ReactMethod
     fun identify(uid: String?, options: ReadableMap?) {
         val optionsHashMap = options?.toHashMap()
-        interceptor.getDashXClient().identify(uid, optionsHashMap as HashMap<String, String>?)
+        interceptor.getDashXClient()?.identify(uid, optionsHashMap as HashMap<String, String>?)
     }
 
     @ReactMethod
     fun reset() {
-        interceptor.getDashXClient().reset()
+        interceptor.getDashXClient()?.reset()
     }
 
     @ReactMethod
@@ -72,22 +72,22 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             return
         }
 
-        interceptor.getDashXClient().track(event, jsonData)
+        interceptor.getDashXClient()?.track(event, jsonData)
     }
 
     @ReactMethod
     fun screen(screenName: String, data: ReadableMap?) {
-        interceptor.getDashXClient().screen(screenName, data?.toHashMap() as HashMap<String, String>)
+        interceptor.getDashXClient()?.screen(screenName, data?.toHashMap() as HashMap<String, String>)
     }
 
     @ReactMethod
     fun setIdentityToken(identityToken: String) {
-        interceptor.getDashXClient().setIdentityToken(identityToken)
+        interceptor.getDashXClient()?.setIdentityToken(identityToken)
     }
 
     @ReactMethod
     fun fetchContent(urn: String, options: ReadableMap?, promise: Promise) {
-        interceptor.getDashXClient().fetchContent(
+        interceptor.getDashXClient()?.fetchContent(
             urn,
             options?.getBooleanIfPresent("preview"),
             options?.getStringIfPresent("language"),
@@ -119,7 +119,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             throw Exception("Encountered an error while parsing order")
         }
 
-        interceptor.getDashXClient().searchContent(
+        interceptor.getDashXClient()?.searchContent(
             contentType,
             options?.getString("returnType") ?: "all",
             jsonFilter,
@@ -159,7 +159,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             throw Exception("Encountered an error while parsing custom")
         }
 
-        interceptor.getDashXClient().addItemToCart(
+        interceptor.getDashXClient()?.addItemToCart(
             itemId,
             pricingId,
             quantity,
@@ -176,7 +176,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
 
     @ReactMethod
     fun fetchCart(promise: Promise) {
-        interceptor.getDashXClient().fetchCart(
+        interceptor.getDashXClient()?.fetchCart(
             onError = {
                 promise.reject("EUNSPECIFIED", it)
             },
@@ -185,9 +185,9 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             }
         )
     }
-    
+
     @ReactMethod
     fun subscribe() {
-        interceptor.getDashXClient().subscribe()
+        interceptor.getDashXClient()?.subscribe()
     }
 }

package/ios/DashXClient.swift

@@ -119,6 +119,18 @@ class DashXClient {
 
         track(Constants.INTERNAL_EVENT_APP_SCREEN_VIEWED, withData: properties?.merging([ "name": screenName], uniquingKeysWith: { (_, new) in new }) as NSDictionary?)
     }
+
+    // https://stackoverflow.com/a/11197770
+    func getDeviceModel() -> String {
+        var systemInfo = utsname()
+        uname(&systemInfo)
+        let machineMirror = Mirror(reflecting: systemInfo.machine)
+        return machineMirror.children.reduce("") { identifier, element in
+            guard let value = element.value as? Int8, value != 0 else { return identifier }
+            return identifier + String(UnicodeScalar(UInt8(value)))
+        }
+    }
+
     // MARK: -- subscribe
 
     func subscribe() {
@@ -129,8 +141,6 @@ class DashXClient {
 
         self.mustSubscribe = false
 
-        let deviceKind = "IOS"
-
         let preferences = UserDefaults.standard
         let deviceTokenKey = Constants.USER_PREFERENCES_KEY_DEVICE_TOKEN
 
@@ -142,9 +152,13 @@ class DashXClient {
         let subscribeContactInput  = DashXGql.SubscribeContactInput(
             accountUid: uid,
             accountAnonymousUid: anonymousUid!,
-            name: deviceKind,
+            name: UIDevice.current.model,
             kind: .ios,
-            value: deviceToken!
+            value: deviceToken!,
+            osName: UIDevice.current.systemName,
+            osVersion: UIDevice.current.systemVersion,
+            deviceModel: getDeviceModel(),
+            deviceManufacturer: "Apple"
         )
 
         DashXLog.d(tag: #function, "Calling subscribe with \(subscribeContactInput)")

package/package.json

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