fixing push messaging in android native

customerio · Sep 24, 2024 · 7ccec97 · 7ccec97
1 parent e50e166
commit 7ccec97
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/android/src/main/java/io/customer/reactnative/sdk/messagingpush/RNCIOPushMessaging.kt b/android/src/main/java/io/customer/reactnative/sdk/messagingpush/RNCIOPushMessaging.kt
@@ -10,6 +10,8 @@ import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.PermissionAwareActivity
 import com.facebook.react.modules.core.PermissionListener
 import io.customer.messagingpush.CustomerIOFirebaseMessagingService
+import io.customer.messagingpush.MessagingPushModuleConfig
+import io.customer.messagingpush.ModuleMessagingPushFCM
 import io.customer.messagingpush.di.pushTrackingUtil
 import io.customer.reactnative.sdk.extension.takeIfNotBlank
 import io.customer.reactnative.sdk.extension.toFCMRemoteMessage
@@ -32,6 +34,10 @@ class RNCIOPushMessaging(
      */
     private var notificationRequestPromise: Promise? = null
 
+    private val SDKComponent.pushModuleConfig: MessagingPushModuleConfig
+        get() = newInstance {
+            modules["MessagingPushFCM"]?.moduleConfig as? MessagingPushModuleConfig ?: MessagingPushModuleConfig.default()
+        }
     init {
         reactContext.addActivityEventListener(this)
     }
@@ -176,7 +182,7 @@ class RNCIOPushMessaging(
     ) {
         // Nothing required here
     }
-
+    
     /**
      * If the app is in background and simple push is received, then FCM notification doesn't
      * start new intent apparently because of `singleTask` launchMode being used by React Native
@@ -189,20 +195,15 @@ class RNCIOPushMessaging(
     override fun onNewIntent(intent: Intent?) {
         val intentArguments = intent?.extras ?: return
         //TODO: Implement pushMessaging later
-        /*
         kotlin.runCatching {
-            val sdkInstance = CustomerIO.instance()
-
-            val pushMessagingModuleConfig = sdkInstance.pushMessaging().moduleConfig
-
-            if (pushMessagingModuleConfig.autoTrackPushEvents) {
+            if (SDKComponent.pushModuleConfig.autoTrackPushEvents) {
                 SDKComponent.pushTrackingUtil
                     .parseLaunchedActivityForTracking(intentArguments)
             }
         }.onFailure { ex ->
             logger.error("Unable to parse push notification intent, reason: ${ex.message}")
         }
-        */
+
     }
 
     override fun getName(): String = "CioRctPushMessaging"
@@ -223,4 +224,4 @@ class RNCIOPushMessaging(
         private const val BUILD_VERSION_CODE_TIRAMISU = 33
         private const val POST_NOTIFICATIONS_PERMISSION_REQUEST = 24676
     }
-}
+}