react-native-firework-sdk 1.1.0 → 1.2.0-beta.2

package/android/build.gradle

@@ -168,7 +168,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
 
   // optional 1: firework sdk release verison
-  def firework_sdk_version = 'v5.11.2'
+  def firework_sdk_version = 'v5.11.4'
   implementation "com.github.loopsocial:firework_sdk:$firework_sdk_version"
 
   // optional 2: firework sdk local version,

package/android/src/main/AndroidManifest.xml

@@ -11,6 +11,15 @@
       android:name="com.fireworksdk.bridge.reactnative.pages.FWVideoShoppingCartActivity"
       android:theme="@style/Theme.AppCompat.Light.NoActionBar"
       />
+    <activity
+      android:name="com.fireworksdk.bridge.reactnative.pages.FWContainerActivity"
+      android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+      />
+    <provider
+      android:authorities="com.fireworksdk.bridge.reactnative"
+      android:name=".reactnative.FWInitializationProvider"
+      android:exported="false"
+      />
     <meta-data
       android:name="com.google.android.gms.ads.AD_MANAGER_APP"
       android:value="true" />

package/android/src/main/java/com/fireworksdk/bridge/{reactnative/FireworkSDKPackage.kt → FireworkSDKPackage.kt}

@@ -1,4 +1,4 @@
-package com.fireworksdk.bridge.reactnative
+package com.fireworksdk.bridge
 
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 import com.fireworksdk.bridge.reactnative.manager.FWVideoFeedManager
 import com.fireworksdk.bridge.reactnative.module.FWLiveStreamModule
+import com.fireworksdk.bridge.reactnative.module.FWNavigatorModule
 import com.fireworksdk.bridge.reactnative.module.FWVideoShoppingModule
 import com.fireworksdk.bridge.reactnative.module.FireworkSDKModule
 
@@ -15,7 +16,8 @@ class FireworkSDKPackage : ReactPackage {
         return listOf(
           FireworkSDKModule(reactContext),
           FWVideoShoppingModule(reactContext),
-          FWLiveStreamModule(reactContext)
+          FWLiveStreamModule(reactContext),
+          FWNavigatorModule(reactContext)
         )
     }
 

package/android/src/main/java/com/fireworksdk/bridge/models/FWEventName.kt

@@ -7,6 +7,7 @@ enum class FWEventName(val rawValue: String) {
   VideoFeedClick("fw:video-feed-click"),
   LiveStream("fw:livestream"),
   LiveStreamChat("fw:livestream-chat"),
+  LogMessage("fw:log-message")
 }
 
 enum class FWSDKInitSubEventName(val rawValue: String) {

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

@@ -0,0 +1,99 @@
+package com.fireworksdk.bridge.reactnative
+
+import android.app.Activity
+import android.app.Application
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.database.Cursor
+import android.net.Uri
+import android.os.Bundle
+import com.fireworksdk.bridge.models.weakProperty
+import com.fireworksdk.bridge.utils.FWLogUtils
+
+class FWInitializationProvider: ContentProvider() {
+
+  var application: Application? = null
+  var resumedActivity by weakProperty<Activity?>()
+
+  override fun onCreate(): Boolean {
+    sInstance = this
+    val context = context
+    if (context != null) {
+      // Many Initializer's expect the `applicationContext` to be non-null. This
+      // typically happens when `android:sharedUid` is used. In such cases, we postpone
+      // initialization altogether, and rely on lazy init.
+      // More context: b/196959015
+      val applicationContext = context.applicationContext as Application?
+      application = applicationContext
+
+      if (applicationContext != null) {
+        applicationContext.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks {
+          override fun onActivityCreated(activity: Activity, bundle: Bundle?) {
+          }
+
+          override fun onActivityStarted(activity: Activity) {
+          }
+
+          override fun onActivityResumed(activity: Activity) {
+            resumedActivity = activity
+          }
+
+          override fun onActivityPaused(activity: Activity) {
+            if (resumedActivity == activity) {
+              resumedActivity = null
+            }
+          }
+
+          override fun onActivityStopped(activity: Activity) {
+          }
+
+          override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {
+          }
+
+          override fun onActivityDestroyed(activity: Activity) {
+          }
+
+        })
+
+      } else {
+        FWLogUtils.w {"Deferring initialization because `applicationContext` is null."}
+      }
+    } else {
+      throw Exception("Context cannot be null")
+    }
+    return true
+  }
+
+  override fun query(
+    p0: Uri,
+    p1: Array<out String>?,
+    p2: String?,
+    p3: Array<out String>?,
+    p4: String?
+  ): Cursor? {
+    throw IllegalStateException("Not allowed.")
+  }
+
+  override fun getType(p0: Uri): String? {
+    throw IllegalStateException("Not allowed.")
+  }
+
+  override fun insert(p0: Uri, p1: ContentValues?): Uri? {
+    throw IllegalStateException("Not allowed.")
+  }
+
+  override fun delete(p0: Uri, p1: String?, p2: Array<out String>?): Int {
+    throw IllegalStateException("Not allowed.")
+  }
+
+  override fun update(p0: Uri, p1: ContentValues?, p2: String?, p3: Array<out String>?): Int {
+    throw IllegalStateException("Not allowed.")
+  }
+
+  companion object {
+    private lateinit var sInstance: FWInitializationProvider
+
+    val INSTANCE: FWInitializationProvider
+      get() = sInstance
+  }
+}

package/android/src/main/java/com/fireworksdk/bridge/reactnative/models/FWNavigatorInterface.kt

@@ -0,0 +1,9 @@
+package com.fireworksdk.bridge.reactnative.models
+
+import com.facebook.react.bridge.Promise
+
+interface FWNavigatorInterface {
+
+  fun pushNativeContainer(callbackId: String?, promise: Promise)
+  fun popNativeContainer(promise: Promise)
+}

package/android/src/main/java/com/fireworksdk/bridge/reactnative/models/FireworkSDKInterface.kt

@@ -5,7 +5,7 @@ import com.facebook.react.bridge.ReadableMap
 
 interface FireworkSDKInterface {
 
-  fun init(userId: String?, adConfig: ReadableMap?)
+  fun init(userId: String?)
   fun openVideoPlayer(url: String, config: ReadableMap?)
   fun setShareBaseURL(url: String?, promise: Promise)
   fun setAdBadgeConfiguration(config: ReadableMap?, promise: Promise)

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

@@ -0,0 +1,74 @@
+package com.fireworksdk.bridge.reactnative.module
+
+import com.facebook.react.bridge.*
+import com.fireworksdk.bridge.reactnative.FWInitializationProvider
+import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
+import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
+import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWDateUtils
+import com.fireworksdk.bridge.utils.FWLogUtils
+import java.util.*
+
+
+class FWNavigatorModule(
+  reactContext: ReactApplicationContext
+) : ReactContextBaseJavaModule(reactContext), FWNavigatorInterface {
+
+  @ReactMethod
+  override fun pushNativeContainer(callbackId: String?, promise: Promise) {
+    FWLogUtils.d { "FWNavigatorModule pushNativeContainer: $callbackId" }
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+
+    if (activity == null) {
+      promise.resolve(false)
+      return
+    }
+
+    FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Enter pushNativeContainer ${FWDateUtils.getDateString(Date())}")
+
+    UiThreadUtil.runOnUiThread {
+
+      FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Before Starting container activity ${FWDateUtils.getDateString(Date())}")
+
+      activity.startActivity(FWContainerActivity.createIntent(activity, callbackId))
+
+      FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] After Starting container activity ${FWDateUtils.getDateString(Date())}")
+    }
+    promise.resolve(true)
+  }
+
+  @ReactMethod
+  override fun popNativeContainer(promise: Promise) {
+    FWLogUtils.d { "FWNavigatorModule popNativeContainer" }
+
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+    if (activity == null) {
+      promise.resolve(false)
+      return
+    }
+
+    UiThreadUtil.runOnUiThread {
+      activity.finish()
+    }
+    promise.resolve(true)
+  }
+
+  @ReactMethod
+  fun addListener(eventName: String?, promise: Promise) {
+    // Set up any upstream listeners or background tasks as necessary
+    FWLogUtils.d { "addListener: $eventName" }
+    promise.resolve(Arguments.createMap())
+  }
+
+  @ReactMethod
+  fun removeListeners(count: Int?, promise: Promise) {
+    // Remove upstream listeners, stop unnecessary background tasks
+    FWLogUtils.d { "removeListeners: $count" }
+    promise.resolve(Arguments.createMap())
+  }
+
+  override fun getName(): String {
+    return "FWNavigatorModule"
+  }
+
+}

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

@@ -3,6 +3,7 @@ package com.fireworksdk.bridge.reactnative.module
 import android.app.Activity
 import com.facebook.react.bridge.*
 import com.fasterxml.jackson.core.type.TypeReference
+import com.fireworksdk.bridge.reactnative.FWInitializationProvider
 import com.loopnow.fireworklibrary.baya.Baya
 import com.loopnow.fireworklibrary.baya.UpdateCartStatus
 import com.fireworksdk.bridge.reactnative.models.FWVideoShoppingInterface
@@ -116,7 +117,7 @@ class FWVideoShoppingModule(
     if (callbackId == null || cartClickHandler?.first != callbackId) {
       return
     }
-    val activity = cartClickHandler?.second ?: return
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity ?: return
 
     UiThreadUtil.runOnUiThread {
       activity.startActivity(FWVideoShoppingCartActivity.createIntent(activity))
@@ -125,8 +126,11 @@ class FWVideoShoppingModule(
 
   @ReactMethod
   override fun exitCartPage() {
+
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity ?: return
+
     UiThreadUtil.runOnUiThread {
-      currentActivity?.finish()
+      activity.finish()
     }
   }
 

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

@@ -14,6 +14,7 @@ import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
 import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.loopnow.fireworklibrary.*
+import java.util.*
 
 
 class FireworkSDKModule(
@@ -35,8 +36,8 @@ class FireworkSDKModule(
    *                           If id passed is not unique, it will affect the quality of content recommended to the user.
    */
   @ReactMethod
-  override fun init(userId: String?, adConfig: ReadableMap?) {
-    init(userId)
+  override fun init(userId: String?) {
+    initSdk(userId)
   }
 
   /**
@@ -106,7 +107,7 @@ class FireworkSDKModule(
     handleVideoPlaybackEvent()
   }
 
-  private fun init(userId: String?) {
+  private fun initSdk(userId: String?) {
     val clientId = getAppid()
     if (clientId.isNullOrBlank()) {
       val errorMsg = "The appid is invalid"
@@ -163,12 +164,12 @@ class FireworkSDKModule(
   }
 
   private fun handleCustomCTAClick() {
-    if (!FWVideoPlayerUtils.customCTAClickEnabled) {
-      return
-    }
     FwSDK.ctaClickHandler = object: FwSDK.CtaClickHandler {
       override fun ctaClicked(label: String, actionUrl: String?): Boolean {
         FWLogUtils.d { "ctaClicked" }
+
+        FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Receive CustomCTAClick event ${FWDateUtils.getDateString(Date())}")
+
         FWEventUtils.sendCustomCTAClickEvent(reactApplicationContext, actionUrl)
         return FWVideoPlayerUtils.customCTAClickEnabled
       }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/pages/FWContainerActivity.kt

@@ -0,0 +1,54 @@
+package com.fireworksdk.bridge.reactnative.pages
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.facebook.react.ReactFragment
+import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
+import com.fireworksdk.bridge.R
+
+class FWContainerActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.fw_bridge_fragment_container)
+
+    val callbackId = intent.getStringExtra(KEY_CALLBACK_ID)
+
+    val reactNativeFragment: Fragment = ReactFragment.Builder()
+      .setComponentName(COMPONENT_NAME)
+      .setLaunchOptions(getLaunchOptions(callbackId))
+      .build()
+
+    supportFragmentManager
+      .beginTransaction()
+      .add(R.id.fw_bridge_container, reactNativeFragment)
+      .commit()
+  }
+
+  private fun getLaunchOptions(callbackId: String?) = Bundle().apply {
+    if (!callbackId.isNullOrEmpty()) {
+      putString(KEY_CALLBACK_ID, callbackId)
+    }
+  }
+
+  companion object {
+
+    private const val KEY_CALLBACK_ID = "callbackId"
+    private const val COMPONENT_NAME = "FWNavigationContainer"
+
+    fun createIntent(activity: Activity, callbackId: String?): Intent {
+      val intent = Intent(activity, FWContainerActivity::class.java)
+      intent.putExtra(KEY_CALLBACK_ID, callbackId)
+      intent.flags = Intent.FLAG_ACTIVITY_NO_ANIMATION
+      activity.overridePendingTransition(0, 0)
+      return intent
+    }
+  }
+
+  override fun invokeDefaultOnBackPressed() {
+    super.onBackPressed();
+  }
+}

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

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.utils.FWLogUtils
 import com.loopnow.fireworklibrary.data.Product
 
 object FWEventUtils {
@@ -109,6 +110,14 @@ object FWEventUtils {
       .emit(eventName, params)
   }
 
+  fun sendLogMessageEvent(reactContext: ReactContext, message: String?) {
+    FWLogUtils.d { message }
+
+    val eventMap = Arguments.createMap()
+    eventMap.putString("message", message)
+    sendEvent(reactContext, FWEventName.LogMessage.rawValue, eventMap)
+  }
+
   fun receiveVideoFeedLoadFinishedSuccessEvent(reactContext: ReactContext, targetTag: Int) {
     receiveEvent(reactContext, targetTag, FWFeedViewEventName.VideoFeedLoadFinished.rawValue, null)
   }

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

@@ -0,0 +1,15 @@
+package com.fireworksdk.bridge.utils
+
+import org.jetbrains.annotations.NotNull
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
+
+object FWDateUtils {
+
+  fun getDateString(@NotNull date: Date): String {
+    val dateFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.getDefault())
+    dateFormat.timeZone = TimeZone.getDefault()
+    return dateFormat.format(date)
+  }
+}

package/android/src/main/res/layout/fw_bridge_fragment_container.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/fw_bridge_container"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>