react-native-iap 12.4.14 → 12.5.0

package/android/src/amazon/java/com/dooboolab/RNIap/RNIapActivityListener.kt

@@ -0,0 +1,33 @@
+package com.dooboolab.RNIap
+
+import android.app.Activity
+import android.util.Log
+import com.amazon.device.iap.PurchasingService
+
+/**
+ * In order of the IAP process to show correctly, AmazonPurchasingService must be registered on Activity.onCreate
+ * registering it in on Application.onCreate will not throw an error but it will now show the Native purchasing screen
+ */
+class RNIapActivityListener {
+    companion object {
+        @JvmStatic
+        var hasListener = false
+
+        @JvmStatic
+        var amazonListener: RNIapAmazonListener? = null
+
+        @JvmStatic
+        fun registerActivity(activity: Activity) {
+            amazonListener = RNIapAmazonListener(null, null)
+            try {
+                PurchasingService.registerListener(activity, amazonListener)
+                hasListener = true
+                // Prefetch user and purchases as per Amazon SDK documentation:
+                PurchasingService.getUserData()
+                PurchasingService.getPurchaseUpdates(false)
+            } catch (e: Exception) {
+                Log.e(RNIapAmazonModule.TAG, "Error initializing Amazon appstore sdk", e)
+            }
+        }
+    }
+}

package/android/src/amazon/java/com/dooboolab/RNIap/RNIapAmazonListener.kt

@@ -19,8 +19,8 @@ val ProductType.typeString: String
     get() = if (this == ProductType.ENTITLED || this == ProductType.CONSUMABLE) "inapp" else "subs"
 
 class RNIapAmazonListener(
-    private val eventSender: EventSender?,
-    private val purchasingService: PurchasingServiceProxy?
+    var eventSender: EventSender?,
+    var purchasingService: PurchasingServiceProxy?
 ) : PurchasingListener {
 
     override fun onProductDataResponse(response: ProductDataResponse) {

package/android/src/amazon/java/com/dooboolab/RNIap/RNIapAmazonModule.kt

@@ -1,11 +1,8 @@
 package com.dooboolab.RNIap
 
-import android.os.Handler
-import android.os.Looper
 import android.util.Log
 import com.amazon.device.drm.LicensingService
 import com.amazon.device.drm.model.LicenseResponse
-import com.amazon.device.iap.PurchasingListener
 import com.amazon.device.iap.model.FulfillmentResult
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
@@ -19,44 +16,35 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 
 @ReactModule(name = RNIapAmazonModule.TAG)
 class RNIapAmazonModule(
-    reactContext: ReactApplicationContext,
+    private val reactContext: ReactApplicationContext,
     private val purchasingService: PurchasingServiceProxy = PurchasingServiceProxyAmazonImpl(),
-    private val handler: Handler = Handler(Looper.getMainLooper()),
-    private val amazonListener: PurchasingListener = RNIapAmazonListener(
-        object : EventSender {
-            private val rctDeviceEventEmitter = reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-
-            override fun sendEvent(eventName: String, params: WritableMap?) {
-                rctDeviceEventEmitter
-                    .emit(eventName, params)
-            }
-        },
-        purchasingService
-    )
+    private var eventSender: EventSender? = null
 ) :
     ReactContextBaseJavaModule(reactContext) {
-    var hasListener = false
     override fun getName(): String {
         return TAG
     }
 
     @ReactMethod
     fun initConnection(promise: Promise) {
-        val context = reactApplicationContext
-
-        handler.postDelayed({
-            try {
-                purchasingService.registerListener(context.applicationContext, amazonListener)
-                hasListener = true
-                // Prefetch user and purchases as per Amazon SDK documentation:
-                purchasingService.getUserData()
-                purchasingService.getPurchaseUpdates(false)
-                promise.safeResolve(true)
-            } catch (e: Exception) {
-                promise.safeReject("Error initializing Amazon appstore sdk", e)
+        if (RNIapActivityListener.amazonListener == null) {
+            promise.safeReject(PromiseUtils.E_DEVELOPER_ERROR, Exception("RNIapActivityListener is not registered in your MainActivity.onCreate"))
+            return
+        }
+        if (eventSender == null) {
+            eventSender = object : EventSender {
+                private val rctDeviceEventEmitter = reactContext
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+
+                override fun sendEvent(eventName: String, params: WritableMap?) {
+                    rctDeviceEventEmitter
+                        .emit(eventName, params)
+                }
             }
-        }, 0L)
+        }
+        RNIapActivityListener.amazonListener?.eventSender = eventSender
+        RNIapActivityListener.amazonListener?.purchasingService = purchasingService
+        promise.resolve(true)
     }
 
     @ReactMethod
@@ -101,7 +89,7 @@ class RNIapAmazonModule(
     @ReactMethod
     fun endConnection(promise: Promise) {
         PromiseUtils.rejectAllPendingPromises()
-        hasListener = false
+        RNIapActivityListener.hasListener = false
         promise.resolve(true)
     }
 
@@ -204,7 +192,7 @@ class RNIapAmazonModule(
              * We should fetch updates on resume
              */
             override fun onHostResume() {
-                if (hasListener) {
+                if (RNIapActivityListener.hasListener) {
                     purchasingService.getUserData()
                     purchasingService.getPurchaseUpdates(false)
                 }

package/android/src/play/java/com/dooboolab/RNIap/RNIapActivityListener.kt

@@ -0,0 +1,15 @@
+package com.dooboolab.RNIap
+
+import android.app.Activity
+
+/**
+ * Currently only needed for Amazon IAP
+ */
+class RNIapActivityListener {
+    companion object {
+        @JvmStatic
+        fun registerActivity(activity: Activity) {
+            // No op
+        }
+    }
+}

package/android/src/testAmazon/java/com/dooboolab/RNIap/RNIapAmazonModuleTest.kt

@@ -1,6 +1,5 @@
 package com.dooboolab.RNIap
 
-import android.os.Handler
 import com.amazon.device.iap.model.PurchaseResponse
 import com.amazon.device.iap.model.Receipt
 import com.amazon.device.iap.model.RequestId
@@ -21,6 +20,7 @@ import io.mockk.slot
 import io.mockk.spyk
 import io.mockk.verify
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.Before
 import org.junit.Test
 import java.util.*
@@ -33,9 +33,6 @@ class RNIapAmazonModuleTest {
     @RelaxedMockK
     lateinit var purchasingServiceProxy: PurchasingServiceProxy
 
-    @MockK
-    lateinit var mainThreadHandler: Handler
-
     @MockK
     lateinit var eventSender: EventSender
 
@@ -47,20 +44,35 @@ class RNIapAmazonModuleTest {
     fun setUp() {
         MockKAnnotations.init(this, relaxUnitFun = true)
         listener = spyk(RNIapAmazonListener(eventSender, purchasingServiceProxy))
-        module = RNIapAmazonModule(context, purchasingServiceProxy, mainThreadHandler, listener)
+        module = RNIapAmazonModule(context, purchasingServiceProxy, eventSender)
     }
 
     @Test
-    fun `initConnection should resolve to true`() {
+    fun `initConnection should resolve to true if RNIapActivityListener is configured`() {
         every { context.applicationContext } returns mockk()
 
         val promise = mockk<Promise>(relaxed = true)
-        val slot = slot<Runnable>()
-        every { mainThreadHandler.postDelayed(capture(slot), any()) } answers { slot.captured.run(); true }
-        module.initConnection(promise)
+
         verify(exactly = 0) { promise.reject(any(), any<String>()) }
+
+        RNIapActivityListener.registerActivity(mockk())
+
+        module.initConnection(promise)
+        // should set eventSender and purchase service
+        assertNotNull(RNIapActivityListener.amazonListener?.purchasingService)
+        assertNotNull(RNIapActivityListener.amazonListener?.eventSender)
+
         verify { promise.resolve(true) }
-        verify { purchasingServiceProxy.registerListener(any(), any()) }
+    }
+
+    @Test
+    fun `initConnection should reject if RNIapActivityListener is not configured`() {
+        every { context.applicationContext } returns mockk()
+
+        val promise = mockk<Promise>(relaxed = true)
+        module.initConnection(promise)
+        verify(exactly = 0) { promise.reject(any(), any<String>()) }
+        verify { promise.reject(PromiseUtils.E_DEVELOPER_ERROR, any(), any<Throwable>()) }
     }
 
     @Test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "12.4.14",
+  "version": "12.5.0",
   "description": "React Native In App Purchase Module.",
   "repository": "https://github.com/dooboolab/react-native-iap",
   "author": "dooboolab <support@dooboolab.com> (https://github.com/dooboolab)",