react-native-firework-sdk 1.1.1 → 1.1.2

package/android/src/main/AndroidManifest.xml

@@ -11,6 +11,11 @@
       android:name="com.fireworksdk.bridge.reactnative.pages.FWVideoShoppingCartActivity"
       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" />
@@ -19,4 +24,5 @@
       android:value="true" />
   </application>
 
+
 </manifest>

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/module/FWVideoShoppingModule.kt

@@ -7,6 +7,7 @@ import com.loopnow.fireworklibrary.baya.Baya
 import com.loopnow.fireworklibrary.baya.UpdateCartStatus
 import com.fireworksdk.bridge.reactnative.models.FWVideoShoppingInterface
 import com.fireworksdk.bridge.models.FWVideoShoppingProduct
+import com.fireworksdk.bridge.reactnative.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.pages.FWVideoShoppingCartActivity
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWJsonUtils
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-firework-sdk",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Firework React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",