@dashx/react-native 0.1.12 → 0.1.15

package/android/build/reports/lint-results.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 3.4.1">
+
+    <issue
+        id="NewApi"
+        severity="Error"
+        message="Call requires API level 24 (current min is 16): `java.lang.Iterable#forEach`"
+        category="Correctness"
+        priority="6"
+        summary="Calling new methods on older versions"
+        explanation="This check scans through all the Android API calls in the application and warns about any calls that are not available on **all** versions targeted by this application (according to its minimum SDK attribute in the manifest).&#xA;&#xA;If you really want to use this API and don&apos;t need to support older devices just set the `minSdkVersion` in your `build.gradle` or `AndroidManifest.xml` files.&#xA;&#xA;If your code is **deliberately** accessing newer APIs, and you have ensured (e.g. with conditional execution) that this code will only ever be called on a supported platform, then you can annotate your class or method with the `@TargetApi` annotation specifying the local minimum SDK to apply, such as `@TargetApi(11)`, such that this check considers 11 rather than your manifest file&apos;s minimum SDK as the required API level.&#xA;&#xA;If you are deliberately setting `android:` attributes in style definitions, make sure you place this in a `values-v`*NN* folder in order to avoid running into runtime conflicts on certain devices where manufacturers have added custom attributes whose ids conflict with the new ones on later platforms.&#xA;&#xA;Similarly, you can use tools:targetApi=&quot;11&quot; in an XML file to indicate that the element will only be inflated in an adequate context."
+        errorLine1="                content.forEach {"
+        errorLine2="                        ~~~~~~~">
+        <location
+            file="/home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/java/com/dashx/rn/sdk/DashXModule.kt"
+            line="138"
+            column="25"/>
+    </issue>
+
+</issues>

package/android/build/tmp/androidJavadocJar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/android/build/tmp/androidSourcesJar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/android/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt

@@ -0,0 +1,2 @@
+com/dashx/rn/sdk/BuildConfig.java
+ com.dashx.rn.sdk.BuildConfig

package/android/build/tmp/compileReleaseJavaWithJavac/source-classes-mapping.txt

@@ -0,0 +1,2 @@
+com/dashx/rn/sdk/BuildConfig.java
+ com.dashx.rn.sdk.BuildConfig

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

@@ -1,21 +1,141 @@
 package com.dashx.rn.sdk
 
+import android.app.Activity
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.media.RingtoneManager
+import android.os.Build
+import android.widget.RemoteViews
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import com.dashx.sdk.DashXLog
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.google.gson.annotations.SerializedName
+import com.google.gson.Gson
+
+data class DashXPayload(
+    @SerializedName("id") val id: String,
+    @SerializedName("title") val title: String?,
+    @SerializedName("body") val body: String?,
+)
 
 class DashXMessagingService : FirebaseMessagingService() {
     private val tag = DashXMessagingService::class.java.simpleName
     private val dashXClient = DashXClientInterceptor.instance.getDashXClient()
+    private val notificationReceiverClass: Class<*> = NotificationReceiver::class.java
 
     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) {
         super.onMessageReceived(remoteMessage)
+
+        val gson = Gson()
+        val dashxDataMap = remoteMessage.getData()["dashx"]
+        var dashxData = gson.fromJson(dashxDataMap, DashXPayload::class.java)
+
+        val id = dashxData.id
+        val title = dashxData.title
+        val body = dashxData.body
+
+        if ((title != null) || (body != null)) {
+            createNotificationChannel()
+
+            NotificationManagerCompat.from(this)
+                .notify(id, 1, createNotification(id, title, body))
+        }
+
         DashXClientInterceptor.instance.handleMessage(remoteMessage)
     }
+
+    private fun createNotificationChannel() {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                CHANNEL_ID,
+                CHANNEL_NAME,
+                NotificationManager.IMPORTANCE_DEFAULT
+            )
+
+            channel.description = CHANNEL_DESCRIPTION
+
+            (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager)
+                .createNotificationChannel(channel)
+        }
+    }
+
+    private fun createNotification(
+        id: String,
+        title: String?,
+        body: String?
+    ) : Notification {
+        val intent = getNewBaseIntent()
+
+        val pendingIntent = PendingIntent.getActivity(this, 1, intent, FLAG_UPDATE_CURRENT)
+
+        val notificationBuilder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(getSmallIcon())
+            .setContentTitle(title)
+            .setContentText(body)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setContentIntent(pendingIntent)
+            .setAutoCancel(true)
+
+        return notificationBuilder.build()
+    }
+
+    private fun getNewBaseIntent(): Intent {
+        return Intent(
+            this,
+            notificationReceiverClass
+        ).addFlags(
+            Intent.FLAG_ACTIVITY_SINGLE_TOP or
+            Intent.FLAG_ACTIVITY_CLEAR_TOP
+        )
+    }
+
+    private fun getSmallIcon(): Int {
+        val context = getApplicationContext()
+        val ai = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA)
+
+        var smallIconInt: Int
+
+        try {
+            val smallIcon = ai.metaData.get(DX_NOTIFICATION_ICON)
+
+            if (smallIcon == null) {
+                throw IllegalArgumentException()
+            }
+
+            smallIconInt = context.getResources().getIdentifier(smallIcon as String, "drawable", context.getPackageName())
+
+            if (smallIconInt == 0) {
+                throw IllegalArgumentException()
+            }
+        } catch (e: IllegalArgumentException) {
+            smallIconInt = ai.icon
+        }
+
+        return smallIconInt
+    }
+
+    companion object {
+        private const val CHANNEL_NAME = "DashX Notification"
+        private const val CHANNEL_DESCRIPTION = "DashX's default notification channel"
+        private const val CHANNEL_ID = "DASHX_NOTIFICATION_CHANNEL"
+        private const val DX_NOTIFICATION_ICON = "DX_NOTIFICATION_ICON"
+    }
 }

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/android/src/main/java/com/dashx/rn/sdk/NotificationReceiver.kt

@@ -0,0 +1,17 @@
+package com.dashx.rn.sdk
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+
+class NotificationReceiver : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        finish()
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        finish()
+    }
+}

package/ios/DashXAppDelegate.swift

@@ -3,23 +3,28 @@ import Foundation
 @objc(DashXAppDelegate)
 class DashXAppDelegate: NSObject {
     static func swizzleDidReceiveRemoteNotification() {
-        DispatchQueue.main.async {
-            let appDelegate = UIApplication.shared.delegate
-            let appDelegateClass = object_getClass(appDelegate)
+        let appDelegate = UIApplication.shared.delegate
+        let appDelegateClass = object_getClass(appDelegate)
 
-            let originalSelector = #selector(UIApplicationDelegate.application(_:didReceiveRemoteNotification:))
-            let swizzledSelector = #selector(
-                DashXAppDelegate.self.handleMessage(_:didReceiveRemoteNotification:)
-            )
+        let originalSelector = #selector(UIApplicationDelegate.application(_:didReceiveRemoteNotification:fetchCompletionHandler:))
+        let swizzledSelector = #selector(DashXAppDelegate.self.handleMessage(_:didReceiveRemoteNotification:fetchCompletionHandler:))
 
-            try? swizzler(appDelegateClass!, DashXAppDelegate.self, originalSelector, swizzledSelector)
+        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))
         }
     }
 
+    // Based on - https://firebase.google.com/docs/cloud-messaging/ios/receive
     @objc
-    func handleMessage(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) {
-        var properties: [String: [String: Any]] = [ "notification": [:] ]
-
+    func handleMessage(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         DashXLog.d(tag: #function, "Received APN: \(userInfo)")
 
         guard let remoteMessage = try? FirebaseRemoteMessage(decoding: userInfo) else {
@@ -27,9 +32,7 @@ class DashXAppDelegate: NSObject {
             return
         }
 
-        properties["notification"]?["title"] = remoteMessage.aps.alert.title
-        properties["notification"]?["body"] = remoteMessage.aps.alert.body
-
-        DashXEventEmitter.instance.dispatch(name: "messageReceived", body: properties)
+        completionHandler(.newData)
+        DashXEventEmitter.instance.dispatch(name: "messageReceived", body: userInfo)
     }
 }