@capillarytech/react-native-hydra-lib 1.7.0-beta.7 → 1.7.0-beta.9

package/android/build.gradle

@@ -164,6 +164,7 @@ android {
 }
 
 repositories {
+  mavenLocal()
   mavenCentral()
   google()
 }
@@ -178,14 +179,14 @@ dependencies {
   //noinspection GradleDependency
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation "com.capillarytech:hydra-core:1.9.22-beta07"
-  implementation "com.capillarytech:hydra-pushbase:1.9.22-beta07"
-  implementation "com.capillarytech:hydra-firebase:1.9.22-beta07"
-  implementation "com.capillarytech:hydra-richnotification:1.9.22-beta07"
+  implementation "com.capillarytech:hydra-core:1.9.22-beta09"
+  implementation "com.capillarytech:hydra-pushbase:1.9.22-beta09"
+  implementation "com.capillarytech:hydra-firebase:1.9.22-beta09"
+  implementation "com.capillarytech:hydra-richnotification:1.9.22-beta09"
 
-  implementation "com.capillarytech:hydra-inbox-core:1.9.22-beta07"
-  implementation "com.capillarytech:hydra-inbox-ui:1.9.22-beta07"
-  implementation "com.capillarytech:hydra-inapp:1.9.22-beta07"
+  implementation "com.capillarytech:hydra-inbox-core:1.9.22-beta09"
+  implementation "com.capillarytech:hydra-inbox-ui:1.9.22-beta09"
+  implementation "com.capillarytech:hydra-inapp:1.9.22-beta09"
   implementation "com.google.firebase:firebase-messaging-ktx:24.1.0"
 
   implementation "com.google.code.gson:gson:2.11.0"

package/android/src/main/java/com/hydralib/delegates/NonHydraNotificationActivity.kt

@@ -5,6 +5,7 @@ import androidx.annotation.RestrictTo
 import androidx.appcompat.app.AppCompatActivity
 import com.capillary.hydra.android.sdk.utils.Logger
 import com.google.gson.Gson
+import com.google.gson.JsonSyntaxException
 import com.google.gson.reflect.TypeToken
 import com.hydralib.eventemitter.HydraEventEmitter
 import com.hydralib.eventemitter.HydraEventType
@@ -27,17 +28,28 @@ class NonHydraNotificationActivity : AppCompatActivity() {
     val remoteMessage = intent.getStringExtra(EXTRA_REMOTE_MESSAGE)
 
     Logger.d(TAG, "Remote Message: $remoteMessage")
-    val gson = Gson()
-    val type = object : TypeToken<Map<String, Any>>() {}.type
-    val remoteMessageMap = gson.fromJson<Map<String, Any>>(remoteMessage, type)
 
-    // Emit event to React Native
-    HydraEventEmitter.sendEvent(
-      HydraEventType.ON_NON_HYDRA_NOTIFICATION_CLICKED,
-      remoteMessageMap
-    )
-
-    Logger.d(TAG, "Event emitted to React Native: ON_NON_HYDRA_NOTIFICATION_CLICKED")
+    if (remoteMessage.isNullOrEmpty()) {
+      Logger.e(TAG, "EXTRA_REMOTE_MESSAGE missing from intent, cannot emit click event")
+      finish()
+      return
+    }
+
+    try {
+      val gson = Gson()
+      val type = object : TypeToken<Map<String, Any>>() {}.type
+      val remoteMessageMap = gson.fromJson<Map<String, Any>>(remoteMessage, type)
+
+      // Emit event to React Native
+      HydraEventEmitter.sendEvent(
+        HydraEventType.ON_NON_HYDRA_NOTIFICATION_CLICKED,
+        remoteMessageMap
+      )
+
+      Logger.d(TAG, "Event emitted to React Native: ON_NON_HYDRA_NOTIFICATION_CLICKED")
+    } catch (e: JsonSyntaxException) {
+      Logger.e(TAG, "Failed to parse remote message JSON: ${e.message}\n${e.stackTraceToString()}")
+    }
     finish()
   }
 }

package/android/src/main/java/com/hydralib/eventemitter/HydraEventEmitter.kt

@@ -60,6 +60,11 @@ object HydraEventEmitter {
         if(callback != null) {
           eventsWithPendingCallback.add(PendingEvent(body, callback))
         }
+      } else {
+        Logger.w(
+          "HydraEventEmitter.sendEvent",
+          "No active listener for eventType = ${eventType.event}, dropping event. body = $body"
+        )
       }
     }
   }
@@ -82,8 +87,23 @@ object HydraEventEmitter {
       "HydraEventEmitter.addListener",
       "addListener called for eventName = $eventName"
     )
-    val eventType = HydraEventType.from(eventName!!)
-    if (!activeEventTypes.contains(eventType!!)) {
+    if (eventName == null) {
+      Logger.e("HydraEventEmitter.addListener", "eventName is null, ignoring addListener call")
+      return
+    }
+    val eventType = try {
+      // HydraEventType.from is declared as returning HydraEventType?, but it never actually
+      // returns null — it throws IllegalArgumentException for an unmapped name — so the null
+      // branch below is unreachable in practice; kept only to satisfy the nullable return type.
+      HydraEventType.from(eventName) ?: run {
+        Logger.e("HydraEventEmitter.addListener", "Unknown eventName = $eventName, ignoring addListener call")
+        return
+      }
+    } catch (e: IllegalArgumentException) {
+      Logger.e("HydraEventEmitter.addListener", "Unknown eventName = $eventName, ignoring addListener call")
+      return
+    }
+    if (!activeEventTypes.contains(eventType)) {
       Logger.d(
         "HydraEventEmitter.addListener",
         "adding event for eventName = $eventName"
@@ -107,13 +127,23 @@ object HydraEventEmitter {
       "removeListener called for eventName = $eventName"
     )
 
-    if (activeEventTypes.contains(HydraEventType.from(eventName!!))) {
+    if (eventName == null) {
+      Logger.e("HydraEventEmitter.removeListener", "eventName is null, ignoring removeListener call")
+      return
+    }
+    val eventType = try {
+      HydraEventType.from(eventName)
+    } catch (e: IllegalArgumentException) {
+      Logger.e("HydraEventEmitter.removeListener", "Unknown eventName = $eventName, ignoring removeListener call")
+      return
+    }
+    if (eventType != null && activeEventTypes.contains(eventType)) {
       Logger.d(
         "HydraEventEmitter.removeListener",
         "removing event for eventName = $eventName"
       )
 
-      activeEventTypes.remove(HydraEventType.from(eventName)!!)
+      activeEventTypes.remove(eventType)
     }
   }
 

package/android/src/main/java/com/hydralib/gamification/GamificationBannerViewManager.kt

@@ -9,6 +9,7 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.capillary.hydra.android.sdk.utils.Logger
 import com.hydralib.eventemitter.HydraEventEmitter
 import com.hydralib.eventemitter.HydraEventType
 import com.hydralib.hydrasdk.HydraCore
@@ -23,11 +24,21 @@ class GamificationBannerViewManager : SimpleViewManager<BannerView>() {
 
   @ReactProp(name = "bannerId")
   fun setBannerId(view: BannerView, bannerId: String?) {
-    if (bannerId.isNullOrEmpty()) return
+    if (bannerId.isNullOrEmpty()) {
+      Logger.e("GamificationBannerViewManager.setBannerId", "bannerId prop is null or empty, skipping bind")
+      return
+    }
+    // Guard: don't re-bind if already bound to this bannerId. Without this, every RN
+    // re-render (triggered by the height-changed event) calls bindWithLayout again and
+    // re-increments the SDK's persistent show-count for this entry point, exhausting its
+    // frequency cap in half the real number of screen visits.
+    if (view.tag == bannerId) return
+    // findEntryPointByBannerId already logs the reason on failure
     val data = findEntryPointByBannerId(bannerId) ?: return
 
     // Defer bind until Yoga has measured and laid out the view
     if (view.width > 0 && view.height > 0) {
+      view.tag = bannerId
       bindWithLayout(view, data, bannerId)
     } else {
       view.addOnLayoutChangeListener(object : View.OnLayoutChangeListener {
@@ -37,6 +48,7 @@ class GamificationBannerViewManager : SimpleViewManager<BannerView>() {
         ) {
           if (right - left > 0 && bottom - top > 0) {
             view.removeOnLayoutChangeListener(this)
+            view.tag = bannerId
             bindWithLayout(view, data, bannerId)
           }
         }
@@ -57,6 +69,14 @@ class GamificationBannerViewManager : SimpleViewManager<BannerView>() {
   private fun bindWithLayout(view: BannerView, data: EntryPointData, bannerId: String) {
     val w = view.width
     val activity = HydraCore.curReactActivity
+    if (activity == null) {
+      // Not a fatal bind failure — the banner still renders — but entry point clicks
+      // will silently no-op below for the life of this view, so surface it.
+      Logger.e(
+        "GamificationBannerViewManager.bindWithLayout",
+        "curReactActivity is null, entry point clicks will not be handled for bannerId = $bannerId"
+      )
+    }
 
     // Set height to 0 so BannerView.bind() enters SDK-managed path
     // and calculates height from dashboard container.height (dp)
@@ -110,9 +130,20 @@ class GamificationBannerViewManager : SimpleViewManager<BannerView>() {
   }
 
   private fun findEntryPointByBannerId(bannerId: String): EntryPointData? {
-    val flowManager = HydraCore.getFlowManager() ?: return null
+    val flowManager = HydraCore.getFlowManager()
+    if (flowManager == null) {
+      Logger.e("GamificationBannerViewManager.findEntryPointByBannerId", "FlowManager is null, cannot resolve bannerId = $bannerId")
+      return null
+    }
     val entryPoints = flowManager.getFilteredEntryPoints(null)
-    return entryPoints.find { it.mobile?.container?.bannerId == bannerId }
+    val entryPoint = entryPoints.find { it.mobile?.container?.bannerId == bannerId }
+    if (entryPoint == null) {
+      Logger.e(
+        "GamificationBannerViewManager.findEntryPointByBannerId",
+        "No matching entry point for bannerId = $bannerId"
+      )
+    }
+    return entryPoint
   }
 
   companion object {

package/android/src/main/java/com/hydralib/gamification/GamificationEmbedViewManager.kt

@@ -8,6 +8,7 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.capillary.hydra.android.sdk.utils.Logger
 import com.hydralib.eventemitter.HydraEventEmitter
 import com.hydralib.eventemitter.HydraEventType
 import com.hydralib.hydrasdk.HydraCore
@@ -29,11 +30,15 @@ class GamificationEmbedViewManager : SimpleViewManager<EmbedWebView>() {
 
   @ReactProp(name = "embedId")
   fun setEmbedId(view: EmbedWebView, embedId: String?) {
-    if (embedId.isNullOrEmpty()) return
+    if (embedId.isNullOrEmpty()) {
+      Logger.e("GamificationEmbedViewManager.setEmbedId", "embedId prop is null or empty, skipping bind")
+      return
+    }
     // Guard: don't re-bind if already bound to this embedId. Without this, every RN
     // re-render (triggered by the height-changed event) calls bindWithLayout again and
     // accumulates an additional OnPreDrawListener, producing an infinite emit loop.
     if (view.tag == embedId) return
+    // findEntryPointByEmbedId already logs the reason on failure
     val data = findEntryPointByEmbedId(embedId) ?: return
 
     // Defer bind until Yoga has measured and laid out the view
@@ -63,7 +68,11 @@ class GamificationEmbedViewManager : SimpleViewManager<EmbedWebView>() {
   private fun bindWithLayout(view: EmbedWebView, data: EntryPointData, embedId: String) {
     val w = view.width
     val h = view.height
-    val activity = HydraCore.curReactActivity ?: return
+    val activity = HydraCore.curReactActivity
+    if (activity == null) {
+      Logger.e("GamificationEmbedViewManager.bindWithLayout", "curReactActivity is null, cannot bind embed view")
+      return
+    }
 
     // Sync layoutParams with Yoga's actual pixel dimensions
     // so SDK sees a positive height and takes host-controlled path
@@ -136,12 +145,24 @@ class GamificationEmbedViewManager : SimpleViewManager<EmbedWebView>() {
   }
 
   private fun findEntryPointByEmbedId(embedId: String): EntryPointData? {
-    val flowManager = HydraCore.getFlowManager() ?: return null
+    val flowManager = HydraCore.getFlowManager()
+    if (flowManager == null) {
+      Logger.e("GamificationEmbedViewManager.findEntryPointByEmbedId", "FlowManager is null, cannot resolve embedId = $embedId")
+      return null
+    }
     val entryPoints = flowManager.getFilteredEntryPoints(null)
-    return entryPoints.find { it.mobile?.container?.bannerId == embedId }
+    val entryPoint = entryPoints.find { it.mobile?.container?.bannerId == embedId }
+    if (entryPoint == null) {
+      Logger.e(
+        "GamificationEmbedViewManager.findEntryPointByEmbedId",
+        "No matching entry point for embedId = $embedId"
+      )
+    }
+    return entryPoint
   }
 
   override fun onDropViewInstance(view: EmbedWebView) {
+    Logger.d("GamificationEmbedViewManager.onDropViewInstance", "Destroying embed view instance")
     preDrawListeners.remove(view)?.let { view.viewTreeObserver.removeOnPreDrawListener(it) }
     view.destroy()
     super.onDropViewInstance(view)

package/android/src/main/java/com/hydralib/gamification/GamificationLoyaltyViewManager.kt

@@ -7,6 +7,7 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.capillary.hydra.android.sdk.utils.Logger
 import com.hydralib.hydrasdk.HydraCore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -22,11 +23,19 @@ class GamificationLoyaltyViewManager : SimpleViewManager<LoyaltyEmbedView>() {
 
   @ReactProp(name = "loyaltyId")
   fun setLoyaltyId(view: LoyaltyEmbedView, loyaltyId: String?) {
-    if (loyaltyId.isNullOrEmpty()) return
+    if (loyaltyId.isNullOrEmpty()) {
+      Logger.e("GamificationLoyaltyViewManager.setLoyaltyId", "loyaltyId prop is null or empty, skipping bind")
+      return
+    }
+    // Guard: don't re-bind if already bound to this loyaltyId. Without this, every RN
+    // re-render calls bindWithLayout again, re-binding the WebView unnecessarily.
+    if (view.tag == loyaltyId) return
+    // findLoyaltyUrlById already logs the reason on failure (missing FlowManager or unmatched id)
     val loyaltyUrl = findLoyaltyUrlById(loyaltyId) ?: return
 
     // Defer bind until Yoga has measured and laid out the view
     if (view.width > 0 && view.height > 0) {
+      view.tag = loyaltyId
       bindWithLayout(view, loyaltyUrl)
     } else {
       view.addOnLayoutChangeListener(object : View.OnLayoutChangeListener {
@@ -36,6 +45,7 @@ class GamificationLoyaltyViewManager : SimpleViewManager<LoyaltyEmbedView>() {
         ) {
           if (right - left > 0 && bottom - top > 0) {
             view.removeOnLayoutChangeListener(this)
+            view.tag = loyaltyId
             bindWithLayout(view, loyaltyUrl)
           }
         }
@@ -51,8 +61,16 @@ class GamificationLoyaltyViewManager : SimpleViewManager<LoyaltyEmbedView>() {
   private fun bindWithLayout(view: LoyaltyEmbedView, loyaltyUrl: LoyaltyUrl) {
     val w = view.width
     val h = view.height
-    val activity = HydraCore.curReactActivity ?: return
-    val flowManager = HydraCore.getFlowManager() ?: return
+    val activity = HydraCore.curReactActivity
+    if (activity == null) {
+      Logger.e("GamificationLoyaltyViewManager.bindWithLayout", "curReactActivity is null, cannot bind loyalty view")
+      return
+    }
+    val flowManager = HydraCore.getFlowManager()
+    if (flowManager == null) {
+      Logger.e("GamificationLoyaltyViewManager.bindWithLayout", "FlowManager is null, cannot bind loyalty view")
+      return
+    }
 
     // Sync layoutParams with Yoga's actual pixel dimensions
     view.layoutParams?.let { lp ->
@@ -62,13 +80,18 @@ class GamificationLoyaltyViewManager : SimpleViewManager<LoyaltyEmbedView>() {
 
     // Resync after game played
     view.onGamePlayed = {
+      Logger.d("GamificationLoyaltyViewManager.onGamePlayed", "Game played, resyncing flow manager")
       CoroutineScope(Dispatchers.Main).launch {
         HydraCore.getFlowManager()?.resync()
       }
     }
 
     val capToken = flowManager.getCapToken()
-    view.bind(loyaltyUrl.url, capToken, activity)
+    view.bind(loyaltyUrl.embedId, loyaltyUrl.url, capToken, activity)
+    Logger.d(
+      "GamificationLoyaltyViewManager.bindWithLayout",
+      "Bound loyalty view, url = ${loyaltyUrl.url}, size = ${w}x$h"
+    )
 
     // Force measure/layout of children — RN parent swallows requestLayout()
     // so LoyaltyEmbedView's internal WebView never gets measured otherwise
@@ -80,11 +103,23 @@ class GamificationLoyaltyViewManager : SimpleViewManager<LoyaltyEmbedView>() {
   }
 
   private fun findLoyaltyUrlById(loyaltyId: String): LoyaltyUrl? {
-    val flowManager = HydraCore.getFlowManager() ?: return null
-    return flowManager.getLoyaltyUrls().find { it.embedId == loyaltyId }
+    val flowManager = HydraCore.getFlowManager()
+    if (flowManager == null) {
+      Logger.e("GamificationLoyaltyViewManager.findLoyaltyUrlById", "FlowManager is null, cannot resolve loyaltyId = $loyaltyId")
+      return null
+    }
+    val loyaltyUrl = flowManager.getLoyaltyUrls().find { it.embedId == loyaltyId }
+    if (loyaltyUrl == null) {
+      Logger.e(
+        "GamificationLoyaltyViewManager.findLoyaltyUrlById",
+        "No matching loyalty URL for loyaltyId = $loyaltyId"
+      )
+    }
+    return loyaltyUrl
   }
 
   override fun onDropViewInstance(view: LoyaltyEmbedView) {
+    Logger.d("GamificationLoyaltyViewManager.onDropViewInstance", "Destroying loyalty view instance")
     view.destroy()
     super.onDropViewInstance(view)
   }

package/android/src/main/java/com/hydralib/hydrasdk/HydraCore.kt

@@ -17,6 +17,7 @@ import com.capillary.hydra.android.sdk.utils.Logger
 import com.capillary.hydra.gamification.GamificationCallback
 import com.capillary.hydra.gamification.GamificationFlowManager
 import com.capillary.hydra.gamification.GamificationRegion
+import com.capillary.hydra.gamification.ThemeMode
 import com.capillary.hydra.gamification.ui.GamificationUIManager
 import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.Arguments
@@ -246,8 +247,12 @@ object HydraCore {
           gamificationWriteKey(cgWriteKey)
           try {
             gamificationRegion(GamificationRegion.valueOf(cgRegion.uppercase()))
-          } catch (_: IllegalArgumentException) {
-
+          } catch (e: IllegalArgumentException) {
+            Log.e(
+              "HydraCore.initHydraInstance",
+              "Invalid gamification region \"$cgRegion\", does not match any GamificationRegion enum value",
+              e
+            )
           }
         }
         if (cgBaseUrl.isNotEmpty()) {
@@ -761,11 +766,13 @@ object HydraCore {
     if (hydraAPI == null) {
       Logger.e("HydraCore.reportUserEvent", "Hydra instance not initialized")
       promise?.reject("Error Reporting user event", "Hydra instance not initialized", Throwable())
+      return
     }
 
     if (eventName == null) {
       Logger.e("HydraCore.reportUserEvent", "Event name cannot be null")
       promise?.reject("Error Reporting user event", "Event name cannot be null", Throwable())
+      return
     }
 
     hydraAPI!!.pushEvent(eventName!!, attributes?.toMap())
@@ -798,7 +805,10 @@ object HydraCore {
       Logger.d("HydraCore.getCurrentUserState", "Current user state: $stateString")
       promise?.resolve(stateString)
     } catch (e: Exception) {
-      Logger.e("HydraCore.getCurrentUserState", "Error getting current user state: ${e.message}")
+      Logger.e(
+        "HydraCore.getCurrentUserState",
+        "Error getting current user state: ${e.message}\n${e.stackTraceToString()}"
+      )
       promise?.reject("Error", "Failed to get current user state", e)
     }
   }
@@ -815,7 +825,10 @@ object HydraCore {
         promise?.resolve(null)
       }
     } catch (e: Exception) {
-      Logger.e("HydraCore.getVisitorDetails", "Error getting visitor details: ${e.message}")
+      Logger.e(
+        "HydraCore.getVisitorDetails",
+        "Error getting visitor details: ${e.message}\n${e.stackTraceToString()}"
+      )
       promise?.reject("Error", "Failed to get visitor details", e)
     }
   }
@@ -830,7 +843,10 @@ object HydraCore {
       Logger.d("HydraCore.isVisitorFlowEnabled", "Visitor flow enabled: $isEnabled")
       promise?.resolve(isEnabled)
     } catch (e: Exception) {
-      Logger.e("HydraCore.isVisitorFlowEnabled", "Error checking visitor flow: ${e.message}")
+      Logger.e(
+        "HydraCore.isVisitorFlowEnabled",
+        "Error checking visitor flow: ${e.message}\n${e.stackTraceToString()}"
+      )
       promise?.reject("Error", "Failed to check visitor flow", e)
     }
   }
@@ -905,4 +921,43 @@ object HydraCore {
     promise?.resolve(hydraAPI!!.isGamificationSuppressed())
   }
 
+  /** Case/whitespace-tolerant lookup, avoids relying on ThemeMode.valueOf()'s exact-match reflection. */
+  private fun parseThemeMode(mode: String): ThemeMode? =
+    when (mode.trim().uppercase()) {
+      "NONE" -> ThemeMode.NONE
+      "AUTO" -> ThemeMode.AUTO
+      "LIGHT" -> ThemeMode.LIGHT
+      "DARK" -> ThemeMode.DARK
+      else -> null
+    }
+
+  fun setThemeMode(mode: String?, promise: Promise?) {
+    if (mode == null) {
+      Logger.e("HydraCore.setThemeMode", "Theme mode is null")
+      promise?.reject("Error setting theme mode", "Theme mode is null", Throwable())
+      return
+    }
+
+    if (hydraAPI == null) {
+      Logger.e("HydraCore.setThemeMode", "HydraAPI is null")
+      promise?.reject("Error setting theme mode", "HydraAPI is null", Throwable())
+      return
+    }
+
+    val themeMode = parseThemeMode(mode)
+    if (themeMode == null) {
+      Logger.e("HydraCore.setThemeMode", "Invalid theme mode: $mode")
+      promise?.reject("Error setting theme mode", "Invalid theme mode: $mode", Throwable())
+      return
+    }
+
+    hydraAPI!!.setThemeMode(themeMode)
+    promise?.resolve(null)
+  }
+
+  fun getThemeMode(promise: Promise?) {
+    val mode = hydraAPI?.getThemeMode() ?: ThemeMode.NONE
+    promise?.resolve(mode.name)
+  }
+
 }

package/android/src/main/java/com/hydralib/hydrasdk/HydraInAppMessages.kt

@@ -66,33 +66,46 @@ object HydraInAppMessages {
     message: ReadableMap?,
     promise: Promise?
   ) {
-
-    message?.let {
-      val messageMap = message.toMap()
-      messageMap["nativeJsonPayload"]?.let {
-        val jsonString = Gson().toJson(it)
-        val payloadFromJson = Gson().fromJson(jsonString, CampaignPayload::class.java)
-        HydraInAppUIHelper.getInstance()
-          .reportInAppMessageIsClicked(HydraCore.appContext!!, payloadFromJson)
-        promise?.resolve(true)
-      }
+    if (message == null) {
+      Logger.e("HydraInAppMessages.reportMessageClicked", "message is null, cannot report click")
+      promise?.reject("Error", "message is null")
+      return
+    }
+    val messageMap = message.toMap()
+    val nativeJsonPayload = messageMap["nativeJsonPayload"]
+    if (nativeJsonPayload == null) {
+      Logger.e("HydraInAppMessages.reportMessageClicked", "nativeJsonPayload missing in message, cannot report click")
+      promise?.reject("Error", "nativeJsonPayload missing in message")
+      return
     }
+    val jsonString = Gson().toJson(nativeJsonPayload)
+    val payloadFromJson = Gson().fromJson(jsonString, CampaignPayload::class.java)
+    HydraInAppUIHelper.getInstance()
+      .reportInAppMessageIsClicked(HydraCore.appContext!!, payloadFromJson)
+    promise?.resolve(true)
   }
 
   fun reportMessageDismissed(
     message: ReadableMap?,
     promise: Promise?
   ) {
-    message?.let {
-      val messageMap = message.toMap()
-      messageMap["nativeJsonPayload"]?.let {
-        val jsonString = Gson().toJson(it)
-        val payloadFromJson = Gson().fromJson(jsonString, CampaignPayload::class.java)
-        HydraInAppUIHelper.getInstance()
-          .reportInAppMessageDismissed(HydraCore.appContext!!, payloadFromJson)
-        promise?.resolve(true)
-      }
+    if (message == null) {
+      Logger.e("HydraInAppMessages.reportMessageDismissed", "message is null, cannot report dismissal")
+      promise?.reject("Error", "message is null")
+      return
+    }
+    val messageMap = message.toMap()
+    val nativeJsonPayload = messageMap["nativeJsonPayload"]
+    if (nativeJsonPayload == null) {
+      Logger.e("HydraInAppMessages.reportMessageDismissed", "nativeJsonPayload missing in message, cannot report dismissal")
+      promise?.reject("Error", "nativeJsonPayload missing in message")
+      return
     }
+    val jsonString = Gson().toJson(nativeJsonPayload)
+    val payloadFromJson = Gson().fromJson(jsonString, CampaignPayload::class.java)
+    HydraInAppUIHelper.getInstance()
+      .reportInAppMessageDismissed(HydraCore.appContext!!, payloadFromJson)
+    promise?.resolve(true)
   }
 
   fun reportMessageRating(
@@ -100,16 +113,23 @@ object HydraInAppMessages {
     rating: Double,
     promise: Promise?
   ) {
-    message?.let {
-      val messageMap = message.toMap()
-      messageMap["nativeJsonPayload"]?.let {
-        val jsonString = Gson().toJson(it)
-        val payloadFromJson = Gson().fromJson(jsonString, CampaignPayload::class.java)
-        HydraInAppUIHelper.getInstance()
-          .reportInAppMessageRating(HydraCore.appContext!!, payloadFromJson, rating.toInt())
-        promise?.resolve(true)
-      }
+    if (message == null) {
+      Logger.e("HydraInAppMessages.reportMessageRating", "message is null, cannot report rating")
+      promise?.reject("Error", "message is null")
+      return
+    }
+    val messageMap = message.toMap()
+    val nativeJsonPayload = messageMap["nativeJsonPayload"]
+    if (nativeJsonPayload == null) {
+      Logger.e("HydraInAppMessages.reportMessageRating", "nativeJsonPayload missing in message, cannot report rating")
+      promise?.reject("Error", "nativeJsonPayload missing in message")
+      return
     }
+    val jsonString = Gson().toJson(nativeJsonPayload)
+    val payloadFromJson = Gson().fromJson(jsonString, CampaignPayload::class.java)
+    HydraInAppUIHelper.getInstance()
+      .reportInAppMessageRating(HydraCore.appContext!!, payloadFromJson, rating.toInt())
+    promise?.resolve(true)
   }
 
   fun reportMessageFeedback(
@@ -118,19 +138,26 @@ object HydraInAppMessages {
     feedbackOptions: ReadableArray?,
     promise: Promise?
   ) {
-    message?.let {
-      val messageMap = message.toMap()
-      messageMap["nativeJsonPayload"]?.let {
-        val jsonString = Gson().toJson(it)
-        val payloadFromJson = Gson().fromJson(jsonString, CampaignPayload::class.java)
-        val feedbackOptionsList = feedbackOptions?.toList()?.mapNotNull { option -> option as? Int } ?: listOf()
-        HydraInAppUIHelper.getInstance().reportInAppMessageFeedback(
-          HydraCore.appContext!!,
-          payloadFromJson,
-          feedbackOptionsList
-        )
-        promise?.resolve(true)
-      }
+    if (message == null) {
+      Logger.e("HydraInAppMessages.reportMessageFeedback", "message is null, cannot report feedback")
+      promise?.reject("Error", "message is null")
+      return
+    }
+    val messageMap = message.toMap()
+    val nativeJsonPayload = messageMap["nativeJsonPayload"]
+    if (nativeJsonPayload == null) {
+      Logger.e("HydraInAppMessages.reportMessageFeedback", "nativeJsonPayload missing in message, cannot report feedback")
+      promise?.reject("Error", "nativeJsonPayload missing in message")
+      return
     }
+    val jsonString = Gson().toJson(nativeJsonPayload)
+    val payloadFromJson = Gson().fromJson(jsonString, CampaignPayload::class.java)
+    val feedbackOptionsList = feedbackOptions?.toList()?.mapNotNull { option -> option as? Int } ?: listOf()
+    HydraInAppUIHelper.getInstance().reportInAppMessageFeedback(
+      HydraCore.appContext!!,
+      payloadFromJson,
+      feedbackOptionsList
+    )
+    promise?.resolve(true)
   }
 }

package/android/src/main/java/com/hydralib/hydrasdk/HydraInbox.kt

@@ -43,7 +43,7 @@ object HydraInbox {
       Logger.d("HydraInbox.markInboxMessageAsRead", "Inbox message marked read successfully")
       return
     }
-    Logger.d("HydraInbox.markInboxMessageAsRead", "Invalid inbox message details")
+    Logger.e("HydraInbox.markInboxMessageAsRead", "Invalid inbox message details, input message = $inboxMessage")
     promise?.resolve(false)
   }
 
@@ -56,7 +56,7 @@ object HydraInbox {
       Logger.d("HydraInbox.deleteInboxMessage", "Inbox message deleted successfully")
       return
     }
-    Logger.d("HydraInbox.deleteInboxMessage", "Invalid inbox message details")
+    Logger.e("HydraInbox.deleteInboxMessage", "Invalid inbox message details, input message = $inboxMessage")
     promise?.resolve(false)
   }
 

package/android/src/main/java/com/hydralib/hydrasdk/HydraPushNotification.kt

@@ -218,7 +218,7 @@ object HydraPushNotification {
 
   fun getFCMToken(promise: Promise?) {
     if (fcmToken == null) {
-      Logger.d("HydraPushNotification.getFCMToken", "Token is not available, try later")
+      Logger.e("HydraPushNotification.getFCMToken", "Token is not available, try later")
       promise?.reject("TokenNotSet", "Token is not available, try later")
       return
     }