react-native-iap 12.4.13 → 12.5.0

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

@@ -0,0 +1,10 @@
+package com.dooboolab.RNIap
+
+import com.facebook.react.bridge.WritableMap
+
+interface EventSender {
+    fun sendEvent(
+        eventName: String,
+        params: WritableMap?
+    )
+}

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

@@ -10,19 +10,17 @@ import com.amazon.device.iap.model.Receipt
 import com.amazon.device.iap.model.UserData
 import com.amazon.device.iap.model.UserDataResponse
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import java.lang.NumberFormatException
 
 val ProductType.typeString: String
     get() = if (this == ProductType.ENTITLED || this == ProductType.CONSUMABLE) "inapp" else "subs"
 
 class RNIapAmazonListener(
-    private val reactContext: ReactContext,
-    private val purchasingService: PurchasingServiceProxy
+    var eventSender: EventSender?,
+    var purchasingService: PurchasingServiceProxy?
 ) : PurchasingListener {
 
     override fun onProductDataResponse(response: ProductDataResponse) {
@@ -96,11 +94,11 @@ class RNIapAmazonListener(
                     val item = receiptToMap(userData, receipt)
                     promiseItem = WritableNativeMap()
                     promiseItem.merge(item)
-                    sendEvent(reactContext, "purchase-updated", item)
+                    eventSender?.sendEvent("purchase-updated", item)
                     availableItems.pushMap(promiseItem)
                 }
                 if (response.hasMore()) {
-                    purchasingService.getPurchaseUpdates(false)
+                    purchasingService?.getPurchaseUpdates(false)
                 } else {
                     if (purchases.size > 0 && promiseItem != null) {
                         PromiseUtils
@@ -129,7 +127,7 @@ class RNIapAmazonListener(
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
-                sendEvent(reactContext, "purchase-error", error)
+                eventSender?.sendEvent("purchase-error", error)
                 PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_QUERY_PURCHASES,
@@ -153,7 +151,7 @@ class RNIapAmazonListener(
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
-                sendEvent(reactContext, "purchase-error", error)
+                eventSender?.sendEvent("purchase-error", error)
                 PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_QUERY_PURCHASES,
@@ -198,7 +196,7 @@ class RNIapAmazonListener(
                 val item = receiptToMap(userData, receipt)
                 val promiseItem: WritableMap = Arguments.createMap()
                 promiseItem.merge(item)
-                sendEvent(reactContext, "purchase-updated", item)
+                eventSender?.sendEvent("purchase-updated", item)
                 PromiseUtils
                     .resolvePromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
@@ -213,7 +211,7 @@ class RNIapAmazonListener(
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
-                sendEvent(reactContext, "purchase-error", error)
+                eventSender?.sendEvent("purchase-error", error)
                 PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
@@ -231,7 +229,7 @@ class RNIapAmazonListener(
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
-                sendEvent(reactContext, "purchase-error", error)
+                eventSender?.sendEvent("purchase-error", error)
                 PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
@@ -248,7 +246,7 @@ class RNIapAmazonListener(
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
-                sendEvent(reactContext, "purchase-error", error)
+                eventSender?.sendEvent("purchase-error", error)
                 PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
@@ -265,7 +263,7 @@ class RNIapAmazonListener(
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
-                sendEvent(reactContext, "purchase-error", error)
+                eventSender?.sendEvent("purchase-error", error)
                 PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
@@ -307,16 +305,6 @@ class RNIapAmazonListener(
         }
     }
 
-    fun sendEvent(
-        reactContext: ReactContext,
-        eventName: String,
-        params: WritableMap?
-    ) {
-        reactContext
-            .getJSModule(RCTDeviceEventEmitter::class.java)
-            .emit(eventName, params)
-    }
-
     companion object {
         private const val E_PRODUCT_DATA_RESPONSE_FAILED = "E_PRODUCT_DATA_RESPONSE_FAILED"
         private const val E_PRODUCT_DATA_RESPONSE_NOT_SUPPORTED =

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
@@ -13,37 +10,41 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.module.annotations.ReactModule
+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(reactContext, 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
@@ -88,7 +89,7 @@ class RNIapAmazonModule(
     @ReactMethod
     fun endConnection(promise: Promise) {
         PromiseUtils.rejectAllPendingPromises()
-        hasListener = false
+        RNIapActivityListener.hasListener = false
         promise.resolve(true)
     }
 
@@ -191,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.*
@@ -34,7 +34,7 @@ class RNIapAmazonModuleTest {
     lateinit var purchasingServiceProxy: PurchasingServiceProxy
 
     @MockK
-    lateinit var mainThreadHandler: Handler
+    lateinit var eventSender: EventSender
 
     private lateinit var listener: RNIapAmazonListener
 
@@ -43,21 +43,36 @@ class RNIapAmazonModuleTest {
     @Before
     fun setUp() {
         MockKAnnotations.init(this, relaxUnitFun = true)
-        listener = spyk(RNIapAmazonListener(context, purchasingServiceProxy))
-        module = RNIapAmazonModule(context, purchasingServiceProxy, mainThreadHandler, listener)
+        listener = spyk(RNIapAmazonListener(eventSender, purchasingServiceProxy))
+        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
@@ -78,7 +93,7 @@ class RNIapAmazonModuleTest {
             every { userData } returns mUserData
         }
 
-        every { listener.sendEvent(any(), any(), any()) } just Runs
+        every { eventSender.sendEvent(any(), any()) } just Runs
 
         every { purchasingServiceProxy.purchase(any()) } answers {
             listener.onPurchaseResponse(
@@ -100,7 +115,7 @@ class RNIapAmazonModuleTest {
         val response = slot<WritableMap>()
         verify { promise.resolve(capture(response)) }
         assertEquals("mySku", response.captured.getString("productId"))
-        verify { listener.sendEvent(any(), "purchase-updated", any()) }
+        verify { eventSender.sendEvent("purchase-updated", any()) }
         verify(exactly = 0) { purchasingServiceProxy.getPurchaseUpdates(false) }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "12.4.13",
+  "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)",