react-native-iap 10.0.1 → 10.0.5

package/README.md

@@ -34,20 +34,20 @@ Please [fund the project](https://opencollective.com/react-native-iap) if you ar
 
 ## Announcement
 
-- Version `9.0.0` is currently in release candidate. The module migrates android sdk to [play billing library v5](https://qonversion.io/blog/google-play-billing-library-5-0) and iOS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). Our core maintainers [andresesfm](https://github.com/andresesfm) and [jeremybarbet](https://github.com/jeremybarbet) are working hard on this.
+- Version `11.0.0` is currently in alpha candidate. The module migrates OS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). [andresesfm](https://github.com/andresesfm) is working hard on this.
 
   ```
   yarn add react-native-iap@next
   ```
 
+- Version `10.0.0` is a maitenance build. Many internal refactorings and clean up of the code. Special thanks to [jeremybarbet](https://github.com/jeremybarbet) for his contributions. Most notably all methods now take an object parameter instead of separate parameters. Please help us test
+
+- Version `9.0.0` The module migrates android sdk to [play billing library v5](https://qonversion.io/blog/google-play-billing-library-5-0). Our core maintainers [andresesfm](https://github.com/andresesfm) and [jeremybarbet](https://github.com/jeremybarbet) worked hard on this.
+
 - Version `8.0.0` has finally landed in Jan 28th. Since this is early release, please use it with caution 🚧. We recommend user to use `>=8.0.0` with react-native `>=0.65.1`. The `next` package is no longer updated until we organize the roadmap for `9.0.0`.
 
 - Version `8.0.0` is currently in release candidate. The module is completely rewritten with `Kotlin` and `Swift` for maintenenance issue by [andresesfm](https://github.com/andresesfm) 🔆. You may install this for early preview.
 
-  ```
-  yarn add react-native-iap@next
-  ```
-
 - React Native IAP hook is out. You can see [medium post](https://medium.com/dooboolab/announcing-react-native-iap-hooks-96c7ffd3f19a) on how to use it.
 
 - The `react-native-iap` module hasn't been maintained well recently. We are thinking of participating again and make the module healthier. Please refer to [2021 Maintenance plan](https://github.com/dooboolab/react-native-iap/issues/1241) and share with us how you or your organization is using it. Happy new year 🎉

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

@@ -15,6 +15,7 @@ import java.util.HashSet
 class RNIapAmazonModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
     var hasListener = false
+    private var amazonListener: RNIapAmazonListener? = null
     override fun getName(): String {
         return TAG
     }
@@ -22,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()
@@ -32,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

@@ -127,6 +127,8 @@ class RNIapModule(
     fun endConnection(promise: Promise) {
         billingClientCache?.endConnection()
         billingClientCache = null
+        skus.clear()
+        DoobooUtils.instance.rejectAllPendingPromises()
         promise.safeResolve(true)
     }