react-native-firework-sdk 2.10.1 → 2.11.1

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FWVideoShoppingModule.kt

@@ -2,6 +2,7 @@ package com.fireworksdk.bridge.reactnative.module
 
 import android.widget.Toast
 import com.facebook.react.bridge.*
+import com.firework.analyticsevents.VideoInfo
 import com.firework.common.product.CurrencyCode
 import com.firework.common.product.Product
 import com.firework.error.shopping.ShoppingError
@@ -19,6 +20,7 @@ import com.fireworksdk.bridge.utils.FWCommonUtil
 import com.fireworksdk.bridge.utils.FWDateUtils
 import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
+import com.fireworksdk.bridge.utils.FWModelUtils
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.*
@@ -186,7 +188,7 @@ class FWVideoShoppingModule(
 
     FireworkSdk.shopping.setShoppingViewOptions(
       ShoppingViewOptions(
-        productCardsOptions = ProductCardsOptions(
+        productCardsOptions = ProductCardsOptions.Default(
           ctaButtonText = productCtaButtonText,
           cornerRadius = productCardCornerRadius.toFloat(),
           isPriceVisible = isPriceVisible,
@@ -266,23 +268,27 @@ class FWVideoShoppingModule(
 
   private fun cartListener() {
     FireworkSdk.shopping.setOnCartClickListener(object : Shopping.OnCartClickListener {
-      override fun onCartClick() {
+      override fun onCartClick(videoInfo: VideoInfo) {
         FWLogUtils.d { "FWVideoShoppingModule cartClicked" }
         val activity = FWInitializationProvider.INSTANCE.resumedActivity
         activity ?: return
+        val videoPlaybackDetails = FWModelUtils.convertVideoInfo2PlaybackDetails(videoInfo)
         val callbackId = generateCallbackId()
-        FWEventUtils.sendCartIconClickEvent(reactApplicationContext, callbackId)
+        FWEventUtils.sendCartIconClickEvent(reactApplicationContext, videoPlaybackDetails, callbackId)
       }
     })
 
-    FireworkSdk.shopping.setOnCtaButtonClicked { productId, unitId, productWebUrl ->
+    FireworkSdk.shopping.setOnCtaButtonClicked { productId, unitId, productWebUrl, videoInfo ->
       FWLogUtils.d { "FWVideoShoppingModule updateCart, productId: $productId, unitId: $unitId" }
 
       FireworkSdk.shopping.setCtaButtonStatus(Shopping.CtaButtonStatus.Loading)
 
       val callbackId = generateCallbackId()
       ctaHandler = Triple(callbackId, productId, unitId)
-      FWEventUtils.sendShoppingCtaButtonClickEvent(reactApplicationContext, productId, unitId, productWebUrl, callbackId)
+
+      val videoPlaybackDetails = FWModelUtils.convertVideoInfo2PlaybackDetails(videoInfo)
+
+      FWEventUtils.sendShoppingCtaButtonClickEvent(reactApplicationContext, productId, unitId, productWebUrl, videoPlaybackDetails, callbackId)
     }
 
     FireworkSdk.shopping.setOnShoppingErrorListener(
@@ -300,25 +306,29 @@ class FWVideoShoppingModule(
 
   private fun productListener() {
     FireworkSdk.shopping.setOnProductHydrationListener(object : Shopping.OnProductHydrationListener {
-      override fun onProductHydration(products: List<Product>, hydrator: ProductHydrator) {
+      override fun onProductHydration(products: List<Product>, hydrator: ProductHydrator, videoInfo: VideoInfo) {
         FWLogUtils.d { "FWVideoShoppingModule hydrateProducts, hydrator: ${hydrator.hashCode()}" }
         if (products.isEmpty()) {
           return
         }
+        val videoPlaybackDetails = FWModelUtils.convertVideoInfo2PlaybackDetails(videoInfo)
         val callbackId = hydrator.hashCode().toString()
         updateProductHandler[callbackId] = products
         updateProductHydratorHandler[callbackId] = hydrator
-        FWEventUtils.sendUpdateProductsDetailsEvent(reactApplicationContext, products, callbackId)
+        FWEventUtils.sendUpdateProductsDetailsEvent(reactApplicationContext, products, videoPlaybackDetails, callbackId)
       }
     })
 
-    FireworkSdk.shopping.setOnProductLinkClickListener { productId, unitId, productWebUrl ->
+    FireworkSdk.shopping.setOnProductLinkClickListener { productId, unitId, productWebUrl, videoInfo ->
       if (FWGlobalDataUtil.customClickLinkButtonEnabled) {
+        val videoPlaybackDetails = FWModelUtils.convertVideoInfo2PlaybackDetails(videoInfo)
+
         FWEventUtils.sendCustomLinkButtonClickEvent(
           reactApplicationContext,
           productWebUrl,
           productId,
           unitId,
+          videoPlaybackDetails,
           callbackId
         )
       }
@@ -336,14 +346,17 @@ class FWVideoShoppingModule(
   override fun setCustomTapProductCardEnabled(value: Boolean?, promise: Promise) {
 
     if (value == true) {
-      FireworkSdk.shopping.setOnProductCardClickListener { productId, unitId, productWebUrl ->
+      FireworkSdk.shopping.setOnProductCardClickListener { productId, unitId, productWebUrl, videoInfo ->
         FWLogUtils.d { "FWVideoShoppingModule productCardClick $productId $unitId $productWebUrl" }
 
+        val videoPlaybackDetails = FWModelUtils.convertVideoInfo2PlaybackDetails(videoInfo)
+
         FWEventUtils.sendProductCardClickEvent(
           reactApplicationContext,
           productWebUrl,
           productId,
           unitId,
+          videoPlaybackDetails,
           callbackId
         )
       }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FireworkSDKModule.kt

@@ -1,15 +1,11 @@
 package com.fireworksdk.bridge.reactnative.module
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Handler
 import android.os.Looper
 import android.os.Process
-import android.provider.Settings
-import android.util.Base64
 import androidx.annotation.Keep
 import com.facebook.react.bridge.*
 import com.firework.analyticsevents.cta.CtaButtonClickAnalyticsEvent
@@ -17,17 +13,14 @@ import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
 import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
 import com.firework.bus.FwAnalyticCallable
 import com.firework.sdk.FireworkSdk
-import com.firework.sdk.FireworkSdkConfig
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.models.*
-import com.fireworksdk.bridge.models.enums.FWPlayerLaunchBehavior
 import com.fireworksdk.bridge.models.enums.FWVideoPlaybackSubEventName
+import com.fireworksdk.bridge.reactnative.FWReactNativeSDK
 import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.*
 import org.json.JSONObject
-import java.nio.charset.StandardCharsets
-import java.security.MessageDigest
 import java.util.*
 import kotlin.system.exitProcess
 
@@ -53,16 +46,39 @@ class FireworkSDKModule(
   @ReactMethod
   override fun init(config: ReadableMap?, promise: Promise) {
     FWColorUtil.useRgba = true
+    FWGlobalDataUtil.pauseWhenNotVisible = true
 
     val configMap = config?.toHashMap() ?: hashMapOf()
     val jsonObject = JSONObject(configMap)
     val sdkInitOptionsModel = FWSDKInitOptionsModelDeserializer.deserialize(jsonObject)
 
     UiThreadUtil.runOnUiThread {
-      initSdk(sdkInitOptionsModel)
+      initCalled(sdkInitOptionsModel)
+      FireworkSdk.analytics.register(this)
       promise.resolve(Arguments.createMap())
+    }
+  }
+
+  @ReactMethod
+  override fun markInitCalled(promise: Promise) {
+    FWColorUtil.useRgba = true
+    FWGlobalDataUtil.pauseWhenNotVisible = true
+
+    val sdkInitResultModel = FWGlobalDataUtil.sdkInitResultModel
+    if (sdkInitResultModel != null) { // init in application
+      if (sdkInitResultModel.success == true) {
+        FWEventUtils.sendInitSuccessEvent(reactApplicationContext)
+      } else if (sdkInitResultModel.success == false) {
+        FWEventUtils.sendInitFailedEvent(reactApplicationContext, sdkInitResultModel.reason)
+      }
+
       FireworkSdk.analytics.register(this)
+      promise.resolve(true)
+
+      return
     }
+
+    promise.resolve(false)
   }
 
   /**
@@ -129,87 +145,6 @@ class FireworkSDKModule(
     FWGlobalDataUtil.videoPlaybackEventEnabled = value?:false
   }
 
-  private fun initSdk(sdkInitOptions: FWSDKInitOptionsModel?) {
-    val clientId = getAppid()
-    if (clientId.isNullOrBlank()) {
-      val errorMsg = "The appid is invalid"
-      FWLogUtils.d { errorMsg }
-      FWEventUtils.sendInitFailedEvent(reactApplicationContext, errorMsg)
-      return
-    }
-    val userId = sdkInitOptions?.userId
-
-    val uid = if (userId.isNullOrBlank()) { getHashedAndroidId() } else userId
-    val shareBaseURL = sdkInitOptions?.shareBaseURL
-    val videoLaunchBehavior = sdkInitOptions?.videoLaunchBehavior
-
-    val configBuilder = FireworkSdkConfig.Builder(reactApplicationContext)
-      .checksumRequired(false)
-      .clientId(clientId)
-      .userId(uid)
-      .enableCache(true)
-    shareBaseURL?.let {
-      FWGlobalDataUtil.shareBaseUrl = it
-    }
-
-    val livestreamPlayerInitializerList = FWLiveStreamUtil.livestreamPlayerInitializers()
-    for (livestreamPlayerInitializer in livestreamPlayerInitializerList) {
-      configBuilder.addLivestreamPlayerInitializer(livestreamPlayerInitializer)
-    }
-    when (videoLaunchBehavior) {
-      FWPlayerLaunchBehavior.Default -> {}
-      FWPlayerLaunchBehavior.MuteOnFirstLaunch -> {
-        configBuilder.muteOnLaunch(true)
-      }
-      else -> {}
-    }
-
-    val imageLoader = FWImageLoaderUtil.getImageLoader()
-    if (imageLoader != null) {
-      configBuilder.imageLoader(imageLoader)
-    }
-
-    val config = configBuilder.build()
-
-    FireworkSdk.init(
-      config,
-      onSuccess = {
-        FWEventUtils.sendInitSuccessEvent(reactApplicationContext)
-      },
-      onError = { error ->
-        FWEventUtils.sendInitFailedEvent(reactApplicationContext, "$error")
-      },
-    )
-  }
-
-  private fun getAppid(): String? {
-    val ai = reactApplicationContext.packageManager.getApplicationInfo(
-      reactApplicationContext.packageName,
-      PackageManager.GET_META_DATA
-    )
-    val value = ai.metaData.get("Firework:Appid")
-    return value?.let {
-      it as String
-    } ?: run {
-      null
-    }
-  }
-
-  @SuppressLint("HardwareIds")
-  private fun getHashedAndroidId(): String {
-    val androidId = Settings.Secure.getString(
-      reactApplicationContext.contentResolver,
-      Settings.Secure.ANDROID_ID
-    )
-    return getHash(androidId)
-  }
-
-  private fun getHash(text: String): String {
-    val digest: MessageDigest = MessageDigest.getInstance("SHA-256")
-    val hash: ByteArray = digest.digest(text.toByteArray(StandardCharsets.UTF_8))
-    return Base64.encodeToString(hash, Base64.DEFAULT)
-  }
-
   @Keep
   @FwAnalyticCallable
   fun onCtaButtonClicked(event: CtaButtonClickAnalyticsEvent) {
@@ -217,24 +152,17 @@ class FireworkSDKModule(
       Date()
     )}")
 
+    val videoPlaybackDetails = FWModelUtils.convertCtaEvent2PlaybackDetails(event)
+
     if (FWGlobalDataUtil.videoPlaybackEventEnabled) {
       FWEventUtils.sendVideoPlaybackEvent(
         reactApplicationContext,
         FWVideoPlaybackSubEventName.ClickCTA.rawValue,
-        FWVideoPlaybackDetails(
-          badge = event.videoInfo.badge,
-          caption = event.videoInfo.caption,
-          duration = event.videoInfo.duration,
-          hasCta = true,
-          playerHeight = event.videoInfo.playerHeight,
-          playerWidth = event.videoInfo.playerWidth,
-          id = event.videoInfo.id,
-          actionUrl = event.actionUrl,
-        )
+        videoPlaybackDetails
       )
     }
 
-    FWEventUtils.sendCustomCTAClickEvent(reactApplicationContext, event.actionUrl)
+    FWEventUtils.sendCustomCTAClickEvent(reactApplicationContext, event.actionUrl, videoPlaybackDetails)
   }
 
   @Keep
@@ -244,15 +172,7 @@ class FireworkSDKModule(
       FWEventUtils.sendVideoPlaybackEvent(
         reactApplicationContext,
         FWVideoPlaybackSubEventName.ClickShare.rawValue,
-        FWVideoPlaybackDetails(
-          badge = event.videoInfo.badge,
-          caption = event.videoInfo.caption,
-          duration = event.videoInfo.duration,
-          hasCta = event.videoInfo.hasCta,
-          playerHeight = event.videoInfo.playerHeight,
-          playerWidth = event.videoInfo.playerWidth,
-          id = event.videoInfo.id,
-        )
+        FWModelUtils.convertShareButtonEvent2PlaybackDetails(event)
       )
     }
   }
@@ -263,18 +183,7 @@ class FireworkSDKModule(
     if (!FWGlobalDataUtil.videoPlaybackEventEnabled) {
       return
     }
-    val progress = event.progress
-
-    val videoPlaybackDetails = FWVideoPlaybackDetails(
-      badge = event.videoInfo.badge,
-      caption = event.videoInfo.caption,
-      duration = event.videoInfo.duration,
-      hasCta = event.videoInfo.hasCta,
-      playerHeight = event.videoInfo.playerHeight,
-      playerWidth = event.videoInfo.playerWidth,
-      id = event.videoInfo.id,
-      progress = progress
-    )
+    val videoPlaybackDetails = FWModelUtils.convertPlayerEvent2PlaybackDetails(event)
     when (event) {
       is PlayerLifecycleAnalyticsEvent.OnStarted -> {
         if (event.videoInfo.isAd) {
@@ -367,6 +276,29 @@ class FireworkSDKModule(
     }, 300)
   }
 
+  @ReactMethod
+  override fun trackPurchase(config: ReadableMap?, promise: Promise) {
+    val configMap = config?.toHashMap() ?: hashMapOf()
+    val jsonObject = JSONObject(configMap)
+    val trackPurchaseModel = FWTrackPurchaseModelDeserializer.deserialize(jsonObject)
+
+    if (trackPurchaseModel?.orderId == null) {
+      promise.resolve(false)
+      return
+    }
+
+    UiThreadUtil.runOnUiThread {
+      FireworkSdk.shopping.trackPurchase(
+        trackPurchaseModel.orderId,
+        trackPurchaseModel.value,
+        trackPurchaseModel.currencyCode,
+        trackPurchaseModel.countryCode,
+        trackPurchaseModel.additionalInfo ?: mutableMapOf()
+      )
+      promise.resolve(true)
+    }
+  }
+
   @ReactMethod
   fun addListener(eventName: String?, promise: Promise) {
     // Set up any upstream listeners or background tasks as necessary
@@ -385,4 +317,24 @@ class FireworkSDKModule(
     return "FireworkSDK"
   }
 
+  private fun initCalled(sdkInitOptionsModel: FWSDKInitOptionsModel? = null) {
+    val context = reactApplicationContext
+    val sdkInitResultModel = FWGlobalDataUtil.sdkInitResultModel
+    if (sdkInitResultModel == null) {
+      // not init in application
+      FWReactNativeSDK.initSdkInternal(context, sdkInitOptionsModel, onSuccess = {
+        FWEventUtils.sendInitSuccessEvent(context)
+      }, onError = {
+        FWEventUtils.sendInitFailedEvent(context, it)
+      })
+    } else {
+      // init in application
+      if (sdkInitResultModel.success == true) {
+        FWEventUtils.sendInitSuccessEvent(context)
+      } else if (sdkInitResultModel.success == false) {
+        FWEventUtils.sendInitFailedEvent(context, sdkInitResultModel.reason)
+      }
+    }
+  }
+
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWEventUtils.kt

@@ -64,16 +64,22 @@ object FWEventUtils {
     sendEvent(reactContext, FWEventName.VideoFeedClick.rawValue, eventMap)
   }
 
-  fun sendCustomCTAClickEvent(reactContext: ReactContext, url: String?) {
+  fun sendCustomCTAClickEvent(reactContext: ReactContext, url: String?, info: FWVideoPlaybackDetails?) {
     val eventMap = Arguments.createMap()
     eventMap.putString("url", url)
+    eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
     sendEvent(reactContext, FWEventName.CustomCTAClick.rawValue, eventMap)
   }
 
   fun sendVideoPlaybackEvent(reactContext: ReactContext, eventName: String, info: FWVideoPlaybackDetails?) {
     val eventMap = Arguments.createMap()
     eventMap.putString("eventName", eventName)
+    eventMap.putMap("info", convertVideoPlaybackDetails2Map(info))
 
+    sendEvent(reactContext, FWEventName.VideoPlayback.rawValue, eventMap)
+  }
+
+  private fun convertVideoPlaybackDetails2Map(info: FWVideoPlaybackDetails?): WritableMap {
     val contentMap = Arguments.createMap()
     if (!info?.id.isNullOrBlank()) {
       contentMap.putString("videoId", info?.id)
@@ -106,27 +112,30 @@ object FWEventUtils {
     if (!info?.actionUrl.isNullOrBlank()) {
       contentMap.putString("ctaActionURL", info?.actionUrl)
     }
-    eventMap.putMap("info", contentMap)
-
-    sendEvent(reactContext, FWEventName.VideoPlayback.rawValue, eventMap)
+    if (!info?.feedId.isNullOrBlank()) {
+      contentMap.putString("feedId", info?.feedId)
+    }
+    return contentMap;
   }
 
-  fun sendShoppingCtaButtonClickEvent(reactContext: ReactContext, productId: String?, unitId: String?, url: String?, callbackId: Int?) {
+  fun sendShoppingCtaButtonClickEvent(reactContext: ReactContext, productId: String?, unitId: String?, url: String?, info: FWVideoPlaybackDetails?, callbackId: Int?) {
     val eventMap = Arguments.createMap()
     eventMap.putString("productId", productId)
     eventMap.putString("unitId", unitId)
     eventMap.putString("url", url)
     eventMap.putInt("callbackId", callbackId?:0)
+    eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
     sendEvent(reactContext, FWVideoShoppingEventName.CtaButtonClick.rawValue, eventMap)
   }
 
-  fun sendCartIconClickEvent(reactContext: ReactContext, callbackId: Int?) {
+  fun sendCartIconClickEvent(reactContext: ReactContext, info: FWVideoPlaybackDetails?, callbackId: Int?) {
     val eventMap = Arguments.createMap()
     eventMap.putInt("callbackId", callbackId?:0)
+    eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
     sendEvent(reactContext, FWVideoShoppingEventName.ClickCartIcon.rawValue, eventMap)
   }
 
-  fun sendUpdateProductsDetailsEvent(reactContext: ReactContext, products: List<Product>?, callbackId: String?) {
+  fun sendUpdateProductsDetailsEvent(reactContext: ReactContext, products: List<Product>?, info: FWVideoPlaybackDetails?, callbackId: String?) {
     val eventMap = Arguments.createMap()
 
     val productArray = Arguments.createArray()
@@ -137,6 +146,7 @@ object FWEventUtils {
     }
 
     eventMap.putArray("productIds", productArray)
+    eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
     eventMap.putString("callbackId", callbackId)
 
     sendLogMessageEvent(reactContext, "[Android] Send UpdateProductDetails event callbackId $callbackId ${FWDateUtils.getDateString(Date())}")
@@ -176,6 +186,12 @@ object FWEventUtils {
     receiveEvent(reactContext, targetTag, FWFeedViewEventName.VideoFeedLoadFinished.rawValue, eventMap)
   }
 
+  fun receiveVideoFeedGetFeedIdEvent(reactContext: ReactContext, targetTag: Int, feedId: String?) {
+    val eventMap = Arguments.createMap()
+    eventMap.putString("feedId", feedId)
+    receiveEvent(reactContext, targetTag, FWFeedViewEventName.VideoFeedGetFeedId.rawValue, eventMap)
+  }
+
   fun receiveStoryBlockLoadFinishedSuccessEvent(reactContext: ReactContext, targetTag: Int) {
     receiveEvent(reactContext, targetTag, FWStoryBlockEventName.StoryBlockLoadFinished.rawValue, null)
   }
@@ -197,6 +213,13 @@ object FWEventUtils {
     receiveEvent(reactContext, targetTag, FWStoryBlockEventName.StoryBlockFullScreenStateChanged.rawValue, eventMap)
   }
 
+  fun receiveStoryBlockGetFeedIdEvent(reactContext: ReactContext, targetTag: Int, feedId: String?) {
+    val eventMap = Arguments.createMap()
+    eventMap.putString("feedId", feedId)
+
+    receiveEvent(reactContext, targetTag, FWStoryBlockEventName.StoryBlockGetFeedId.rawValue, eventMap)
+  }
+
   private fun receiveEvent(reactContext: ReactContext, targetTag: Int, eventName: String, event: WritableMap?) {
     reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(
       targetTag,
@@ -256,21 +279,23 @@ object FWEventUtils {
     sendEvent(reactContext, FWEventName.LiveStreamChat.rawValue, eventMap)
   }
 
-  fun sendProductCardClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, callbackId: Int?) {
+  fun sendProductCardClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, info: FWVideoPlaybackDetails?, callbackId: Int?) {
     val eventMap = Arguments.createMap()
     eventMap.putString("url", url ?: "")
     eventMap.putString("productId", productId)
     eventMap.putString("unitId", unitId)
     eventMap.putInt("callbackId", callbackId?:0)
+    eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
     sendEvent(reactContext, FWVideoShoppingEventName.CustomProductCardTap.rawValue, eventMap)
   }
 
-  fun sendCustomLinkButtonClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, callbackId: Int?) {
+  fun sendCustomLinkButtonClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, info: FWVideoPlaybackDetails?, callbackId: Int?) {
     val eventMap = Arguments.createMap()
     eventMap.putString("url", url ?: "")
     eventMap.putString("productId", productId)
     eventMap.putString("unitId", unitId)
     eventMap.putInt("callbackId", callbackId?:0)
+    eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
     sendEvent(reactContext, FWVideoShoppingEventName.CustomLinkButtonClick.rawValue, eventMap)
   }
 }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWConfigUtil.kt

@@ -32,6 +32,7 @@ import com.fireworksdk.bridge.models.enums.FWVideoFeedMode
 import com.fireworksdk.bridge.models.enums.FWVideoFeedSource
 import com.fireworksdk.bridge.models.enums.FWVideoFeedTitlePosition
 import com.fireworksdk.bridge.models.enums.FWVideoPlayerCTAWidth
+import com.fireworksdk.bridge.models.enums.FWVideoPlayerLogoOption
 
 object FWConfigUtil {
 
@@ -394,6 +395,18 @@ object FWConfigUtil {
       }
     }
 
+    val logoConfigOption = videoFeedPropsModel.videoPlayerConfiguration?.videoPlayerLogoConfiguration?.option
+    val logoConfigChannelId = videoFeedPropsModel.videoPlayerConfiguration?.videoPlayerLogoConfiguration?.encodedId
+    when {
+      logoConfigOption == FWVideoPlayerLogoOption.Creator && !logoConfigChannelId.isNullOrBlank() -> {
+        playerOptionBuilder.logoConfig(LogoConfig.Logo.CreatorLogo(logoConfigChannelId))
+      }
+      logoConfigOption == FWVideoPlayerLogoOption.ChannelAggregator && !logoConfigChannelId.isNullOrBlank() -> {
+        playerOptionBuilder.logoConfig(LogoConfig.Logo.AggregatorLogo(logoConfigChannelId))
+      }
+      else -> {}
+    }
+
     return ViewOptions.Builder()
       .layoutOption(layoutOptionBuilder.build())
       .titleOption(titleOptionBuilder.build())

package/android/src/main/java/com/fireworksdk/bridge/utils/FWFragmentUtil.kt

@@ -17,7 +17,7 @@ object FWFragmentUtil {
     fragmentActivity ?: return
 
     fragment ?: return
-    if (!fragment.isAdded || fragment.isDetached || fragment.isRemoving) {
+    if (!fragment.isAdded || fragment.isDetached || fragment.isRemoving || fragmentActivity.isFinishing) {
       return
     }
 
@@ -25,7 +25,7 @@ object FWFragmentUtil {
       removeChildFragment(fragment)
     }
 
-    fragmentActivity.supportFragmentManager.beginTransaction().remove(fragment).commit()
+    fragmentActivity.supportFragmentManager.beginTransaction().remove(fragment).commitAllowingStateLoss()
   }
 
   private fun removeChildFragment(fragment: Fragment?) {
@@ -45,7 +45,7 @@ object FWFragmentUtil {
       if (!fragment.isAdded || fragment.isDetached || fragment.isRemoving) {
         continue
       }
-      cfm.beginTransaction().remove(f).commit()
+      cfm.beginTransaction().remove(f).commitAllowingStateLoss()
     }
   }
 }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWGlobalDataUtil.kt

@@ -1,11 +1,12 @@
 package com.fireworksdk.bridge.utils
 
-import com.fireworksdk.bridge.components.storyblock.StoryBlockFragment
 import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
-import com.fireworksdk.bridge.models.weakProperty
+import com.fireworksdk.bridge.models.FWSdkInitResultModel
 
 object FWGlobalDataUtil {
 
+  var sdkInitResultModel: FWSdkInitResultModel? = null
+
   var adBadgeConfigModel: FWAdBadgeConfigModel = FWAdBadgeConfigModel()
 
   var customCTAClickEnabled: Boolean = false
@@ -15,4 +16,6 @@ object FWGlobalDataUtil {
   var customClickLinkButtonEnabled: Boolean = false
 
   var shareBaseUrl: String? = null
+
+  var pauseWhenNotVisible: Boolean = false
 }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWModelUtils.kt

@@ -0,0 +1,64 @@
+package com.fireworksdk.bridge.utils
+
+import com.firework.analyticsevents.VideoInfo
+import com.firework.analyticsevents.cta.CtaButtonClickAnalyticsEvent
+import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
+import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
+import com.fireworksdk.bridge.models.FWVideoPlaybackDetails
+
+object FWModelUtils {
+  fun convertVideoInfo2PlaybackDetails(videoInfo: VideoInfo): FWVideoPlaybackDetails {
+    return FWVideoPlaybackDetails(
+      badge = videoInfo.badge,
+      caption = videoInfo.caption,
+      duration = videoInfo.duration,
+      hasCta = videoInfo.hasCta,
+      playerHeight = videoInfo.playerHeight,
+      playerWidth = videoInfo.playerWidth,
+      id = videoInfo.id,
+      feedId = videoInfo.feedId,
+    )
+  }
+
+  fun convertCtaEvent2PlaybackDetails(event: CtaButtonClickAnalyticsEvent): FWVideoPlaybackDetails {
+    return FWVideoPlaybackDetails(
+      badge = event.videoInfo.badge,
+      caption = event.videoInfo.caption,
+      duration = event.videoInfo.duration,
+      hasCta = true,
+      playerHeight = event.videoInfo.playerHeight,
+      playerWidth = event.videoInfo.playerWidth,
+      id = event.videoInfo.id,
+      actionUrl = event.actionUrl,
+      feedId = event.videoInfo.feedId,
+    )
+  }
+
+  fun convertPlayerEvent2PlaybackDetails(event: PlayerLifecycleAnalyticsEvent): FWVideoPlaybackDetails {
+    return FWVideoPlaybackDetails(
+      badge = event.videoInfo.badge,
+      caption = event.videoInfo.caption,
+      duration = event.videoInfo.duration,
+      hasCta = event.videoInfo.hasCta,
+      playerHeight = event.videoInfo.playerHeight,
+      playerWidth = event.videoInfo.playerWidth,
+      id = event.videoInfo.id,
+      progress = event.progress,
+      feedId = event.videoInfo.feedId,
+    )
+  }
+
+  fun convertShareButtonEvent2PlaybackDetails(event: ShareButtonAnalyticsEvent): FWVideoPlaybackDetails {
+    return FWVideoPlaybackDetails(
+      badge = event.videoInfo.badge,
+      caption = event.videoInfo.caption,
+      duration = event.videoInfo.duration,
+      hasCta = event.videoInfo.hasCta,
+      playerHeight = event.videoInfo.playerHeight,
+      playerWidth = event.videoInfo.playerWidth,
+      id = event.videoInfo.id,
+      feedId = event.videoInfo.feedId,
+    )
+  }
+
+}