react-native-iap 12.4.13 → 12.4.14

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/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
+    private val eventSender: EventSender?,
+    private val 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

@@ -13,14 +13,27 @@ 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 purchasingService: PurchasingServiceProxy = PurchasingServiceProxyAmazonImpl(),
     private val handler: Handler = Handler(Looper.getMainLooper()),
-    private val amazonListener: PurchasingListener = RNIapAmazonListener(reactContext, purchasingService)
+    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
+    )
 ) :
     ReactContextBaseJavaModule(reactContext) {
     var hasListener = false

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

@@ -36,6 +36,9 @@ class RNIapAmazonModuleTest {
     @MockK
     lateinit var mainThreadHandler: Handler
 
+    @MockK
+    lateinit var eventSender: EventSender
+
     private lateinit var listener: RNIapAmazonListener
 
     private lateinit var module: RNIapAmazonModule
@@ -43,7 +46,7 @@ class RNIapAmazonModuleTest {
     @Before
     fun setUp() {
         MockKAnnotations.init(this, relaxUnitFun = true)
-        listener = spyk(RNIapAmazonListener(context, purchasingServiceProxy))
+        listener = spyk(RNIapAmazonListener(eventSender, purchasingServiceProxy))
         module = RNIapAmazonModule(context, purchasingServiceProxy, mainThreadHandler, listener)
     }
 
@@ -78,7 +81,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 +103,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.4.14",
   "description": "React Native In App Purchase Module.",
   "repository": "https://github.com/dooboolab/react-native-iap",
   "author": "dooboolab <support@dooboolab.com> (https://github.com/dooboolab)",