react-native-iap 10.0.0 → 10.0.3

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

@@ -333,6 +333,10 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                     )
         }
     }
+    fun clear(){
+        skus.clear()
+
+    }
 
     private fun sendEvent(
         reactContext: ReactContext,

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

@@ -9,11 +9,13 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.WritableNativeArray
+import com.facebook.react.module.annotations.ReactModule
 import java.util.HashSet
-
+@ReactModule(name = RNIapAmazonModule.TAG)
 class RNIapAmazonModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
     var hasListener = false
+    private var amazonListener: RNIapAmazonListener? = null
     override fun getName(): String {
         return TAG
     }
@@ -21,7 +23,9 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
     @ReactMethod
     fun initConnection(promise: Promise) {
         val context = reactApplicationContext
-        PurchasingService.registerListener(context, RNIapAmazonListener(context))
+        val amazonListener = RNIapAmazonListener(context)
+        this.amazonListener = amazonListener
+        PurchasingService.registerListener(context, amazonListener)
         hasListener = true
         // Prefetch user and purchases as per Amazon SDK documentation:
         PurchasingService.getUserData()
@@ -31,6 +35,9 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun endConnection(promise: Promise) {
+        DoobooUtils.instance.rejectAllPendingPromises()
+        amazonListener?.clear()
+        hasListener = false
         promise.resolve(true)
     }
 

package/android/src/main/java/com/dooboolab/RNIap/DoobooUtils.kt

@@ -49,6 +49,13 @@ class DoobooUtils {
         }
     }
 
+    fun rejectAllPendingPromises() {
+        promises.flatMap { it.value }.forEach { promise ->
+            promise.safeReject(E_CONNECTION_CLOSED, "Connection has been closed", null)
+        }
+        promises.clear()
+    }
+
     fun rejectPromisesForKey(
         key: String,
         code: String?,
@@ -175,6 +182,7 @@ class DoobooUtils {
         const val E_USER_ERROR = "E_USER_ERROR"
         const val E_DEVELOPER_ERROR = "E_DEVELOPER_ERROR"
         const val E_BILLING_RESPONSE_JSON_PARSE_ERROR = "E_BILLING_RESPONSE_JSON_PARSE_ERROR"
+        const val E_CONNECTION_CLOSED = "E_CONNECTION_CLOSED"
         val instance = DoobooUtils()
     }
 }

package/android/src/{play → main}/java/com/dooboolab/RNIap/PromiseUtlis.kt

@@ -9,11 +9,13 @@ import com.facebook.react.bridge.Promise
  * want to crash in the case of it being resolved/rejected more than once
  */
 
+const val TAG = "IapPromises"
+
 fun Promise.safeResolve(value: Any) {
     try {
         this.resolve(value)
     } catch (oce: ObjectAlreadyConsumedException) {
-        Log.d(RNIapModule.TAG, "Already consumed ${oce.message}")
+        Log.d(TAG, "Already consumed ${oce.message}")
     }
 }
 
@@ -28,6 +30,6 @@ fun Promise.safeReject(code: String?, message: String?, throwable: Throwable?) {
     try {
         this.reject(code, message, throwable)
     } catch (oce: ObjectAlreadyConsumedException) {
-        Log.d(RNIapModule.TAG, "Already consumed ${oce.message}")
+        Log.d(TAG, "Already consumed ${oce.message}")
     }
 }

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

@@ -30,11 +30,12 @@ import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import java.util.ArrayList
-
+@ReactModule(name = RNIapModule.TAG)
 class RNIapModule(
     private val reactContext: ReactApplicationContext,
     private val builder: BillingClient.Builder = BillingClient.newBuilder(reactContext).enablePendingPurchases(),
@@ -126,6 +127,8 @@ class RNIapModule(
     fun endConnection(promise: Promise) {
         billingClientCache?.endConnection()
         billingClientCache = null
+        skus.clear()
+        DoobooUtils.instance.rejectAllPendingPromises()
         promise.safeResolve(true)
     }