pr suggestions

customerio · Sep 25, 2023 · e9d8395 · e9d8395
1 parent 9b29848
commit e9d8395
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/...ush/src/main/java/io/customer/messagingpush/activity/NotificationClickReceiverActivity.kt b/...ush/src/main/java/io/customer/messagingpush/activity/NotificationClickReceiverActivity.kt
@@ -64,17 +64,30 @@ class NotificationClickReceiverActivity : Activity(), TrackableScreen {
             return
         }
 
-        val diGraph = sdkInstance.diGraph
-        val deepLinkUtil: DeepLinkUtil = diGraph.deepLinkUtil
-        val moduleConfig: MessagingPushModuleConfig = diGraph.moduleConfig
-
-        val deliveryId = payload.cioDeliveryId
-        val deliveryToken = payload.cioDeliveryToken
-        val deepLink = payload.deepLink?.takeIfNotBlank()
+        val moduleConfig: MessagingPushModuleConfig = sdkInstance.diGraph.moduleConfig
+        trackMetrics(moduleConfig, payload)
+        handleDeepLink(moduleConfig, payload)
+    }
 
+    private fun trackMetrics(
+        moduleConfig: MessagingPushModuleConfig,
+        payload: CustomerIOParsedPushPayload
+    ) {
         if (moduleConfig.autoTrackPushEvents) {
-            sdkInstance.trackMetric(deliveryId, MetricEvent.opened, deliveryToken)
+            CustomerIO.instance().trackMetric(
+                payload.cioDeliveryId,
+                MetricEvent.opened,
+                payload.cioDeliveryToken
+            )
         }
+    }
+
+    private fun handleDeepLink(
+        moduleConfig: MessagingPushModuleConfig,
+        payload: CustomerIOParsedPushPayload
+    ) {
+        val deepLinkUtil: DeepLinkUtil = CustomerIO.instance().diGraph.deepLinkUtil
+        val deepLink = payload.deepLink?.takeIfNotBlank()
 
         // check if host app overrides the handling of deeplink
         val notificationCallback = moduleConfig.notificationCallback