react-native-iap 12.14.1-rc.1 → 12.14.1

package/README.md

@@ -11,6 +11,7 @@
 ---
 
 ## Announcement
+
 Announcing the Migration of react-native-iap to an Expo Module for Improved Maintenance and Compatibility in [discussion #2754](https://github.com/dooboolab-community/react-native-iap/discussions/2754).
 
 ## Documentation
@@ -53,16 +54,14 @@ Follow [this guide](./IapExample/README.md) to get the example running.
 
 ### <p style="color: gold;">Gold Tier</p>
 
-| [NAMI](https://namiml.com) |
-|:--:|
+|                                                                       [NAMI](https://namiml.com)                                                                       |
+| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
 | <a href="https://namiml.com"><img src="https://github.com/dooboolab-community/react-native-iap/assets/27461460/89d71f61-bb73-400a-83bd-fe0f96eb726e" width="450"/></a> |
 
-
-## Past  Sponsors
+## Past Sponsors
 
 <a href="https://www.revenuecat.com"><img src="https://github.com/dooboolab-community/react-native-iap/assets/27461460/1e387a47-afe0-4b85-ad78-1064ca6623fa" width="200"/></a>
 
-
 Support this project by becoming a sponsor. Your logo will show up here with
 a link to your website. [Buy me a coffee](https://www.buymeacoffee.com/dooboolab) or
 [Become a sponsor](https://opencollective.com/react-native-iap#sponsor).
@@ -83,4 +82,3 @@ Thank you to all the people who helped to maintain and upgrade this project!
 ---
 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdooboolab%2Freact-native-iap.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdooboolab%2Freact-native-iap?ref=badge_large)
-

package/android/gradle.properties

@@ -6,7 +6,7 @@ RNIap_buildToolsVersion=33.0.0
 RNIap_ndkversion=23.1.7779620
 RNIap_playServicesVersion=18.1.0
 RNIap_amazonSdkVersion=3.0.4
-RNIap_playBillingSdkVersion=7.0.0
+RNIap_playBillingSdkVersion=6.1.0
 
 android.useAndroidX=true
 android.enableJetifier=true

package/android/src/amazon/java/com/dooboolab/rniap/PurchasingServiceProxy.kt

@@ -6,10 +6,7 @@ import com.amazon.device.iap.model.FulfillmentResult
 import com.amazon.device.iap.model.RequestId
 
 interface PurchasingServiceProxy {
-    fun registerListener(
-        var0: Context?,
-        var1: PurchasingListener?,
-    )
+    fun registerListener(var0: Context?, var1: PurchasingListener?)
 
     fun getUserData(): RequestId
 
@@ -19,8 +16,5 @@ interface PurchasingServiceProxy {
 
     fun getPurchaseUpdates(var0: Boolean): RequestId
 
-    fun notifyFulfillment(
-        var0: String?,
-        var1: FulfillmentResult?,
-    )
+    fun notifyFulfillment(var0: String?, var1: FulfillmentResult?)
 }

package/android/src/amazon/java/com/dooboolab/rniap/PurchasingServiceProxyAmazonImpl.kt

@@ -7,21 +7,27 @@ import com.amazon.device.iap.model.FulfillmentResult
 import com.amazon.device.iap.model.RequestId
 
 class PurchasingServiceProxyAmazonImpl : PurchasingServiceProxy {
-    override fun registerListener(
-        var0: Context?,
-        var1: PurchasingListener?,
-    ) = PurchasingService.registerListener(var0, var1)
+    override fun registerListener(var0: Context?, var1: PurchasingListener?) {
+        return PurchasingService.registerListener(var0, var1)
+    }
 
-    override fun getUserData(): RequestId = PurchasingService.getUserData()
+    override fun getUserData(): RequestId {
+        return PurchasingService.getUserData()
+    }
 
-    override fun purchase(var0: String?): RequestId = PurchasingService.purchase(var0)
+    override fun purchase(var0: String?): RequestId {
+        return PurchasingService.purchase(var0)
+    }
 
-    override fun getProductData(var0: Set<String?>?): RequestId = PurchasingService.getProductData(var0)
+    override fun getProductData(var0: Set<String?>?): RequestId {
+        return PurchasingService.getProductData(var0)
+    }
 
-    override fun getPurchaseUpdates(var0: Boolean): RequestId = PurchasingService.getPurchaseUpdates(var0)
+    override fun getPurchaseUpdates(var0: Boolean): RequestId {
+        return PurchasingService.getPurchaseUpdates(var0)
+    }
 
-    override fun notifyFulfillment(
-        var0: String?,
-        var1: FulfillmentResult?,
-    ) = PurchasingService.notifyFulfillment(var0, var1)
+    override fun notifyFulfillment(var0: String?, var1: FulfillmentResult?) {
+        return PurchasingService.notifyFulfillment(var0, var1)
+    }
 }

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

@@ -22,6 +22,7 @@ class RNIapAmazonListener(
     var eventSender: EventSender?,
     var purchasingService: PurchasingServiceProxy?,
 ) : PurchasingListener {
+
     override fun onProductDataResponse(response: ProductDataResponse) {
         when (response.requestStatus) {
             ProductDataResponse.RequestStatus.SUCCESSFUL -> {
@@ -169,10 +170,7 @@ class RNIapAmazonListener(
         }
     }
 
-    private fun receiptToMap(
-        userData: UserData,
-        receipt: Receipt,
-    ): WritableMap {
+    private fun receiptToMap(userData: UserData, receipt: Receipt): WritableMap {
         val item = Arguments.createMap()
         item.putString("productId", receipt.sku)
         item.putDouble("transactionDate", receipt.purchaseDate.time.toDouble())

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

@@ -22,33 +22,28 @@ class RNIapAmazonModule(
     private val reactContext: ReactApplicationContext,
     private val purchasingService: PurchasingServiceProxy = PurchasingServiceProxyAmazonImpl(),
     private var eventSender: EventSender? = null,
-) : ReactContextBaseJavaModule(reactContext) {
-    override fun getName(): String = TAG
+) :
+    ReactContextBaseJavaModule(reactContext) {
+    override fun getName(): String {
+        return TAG
+    }
 
     @ReactMethod
     fun initConnection(promise: Promise) {
         if (RNIapActivityListener.amazonListener == null) {
-            promise.safeReject(
-                PromiseUtils.E_DEVELOPER_ERROR,
-                Exception("RNIapActivityListener is not registered in your MainActivity.onCreate"),
-            )
+            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)
-                    }
+            eventSender = object : EventSender {
+                private val rctDeviceEventEmitter = reactContext
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+
+                override fun sendEvent(eventName: String, params: WritableMap?) {
+                    rctDeviceEventEmitter
+                        .emit(eventName, params)
                 }
+            }
         }
         RNIapActivityListener.amazonListener?.eventSender = eventSender
         RNIapActivityListener.amazonListener?.purchasingService = purchasingService
@@ -114,11 +109,7 @@ class RNIapAmazonModule(
     }
 
     @ReactMethod
-    fun getItemsByType(
-        type: String?,
-        skuArr: ReadableArray,
-        promise: Promise,
-    ) {
+    fun getItemsByType(type: String?, skuArr: ReadableArray, promise: Promise) {
         val productSkus: MutableSet<String> = HashSet()
         var ii = 0
         val skuSize = skuArr.size()
@@ -180,10 +171,7 @@ class RNIapAmazonModule(
      * From https://amazon.developer.forums.answerhub.com/questions/175720/how-to-open-store-subscription-screen-directly-use.html?childToView=179402#answer-179402
      */
     @ReactMethod
-    fun deepLinkToSubscriptions(
-        isAmazonDevice: Boolean,
-        promise: Promise,
-    ) {
+    fun deepLinkToSubscriptions(isAmazonDevice: Boolean, promise: Promise) {
         if (isAmazonDevice) {
             val intent =
                 Intent("android.intent.action.VIEW", Uri.parse("amzn://apps/library/subscriptions"))
@@ -222,26 +210,22 @@ class RNIapAmazonModule(
 
         const val TAG = "RNIapAmazonModule"
     }
-
     init {
-        val lifecycleEventListener: LifecycleEventListener =
-            object : LifecycleEventListener {
-                /**
-                 * From https://developer.amazon.com/docs/in-app-purchasing/iap-implement-iap.html#getpurchaseupdates-responses
-                 * We should fetch updates on resume
-                 */
-                override fun onHostResume() {
-                    if (RNIapActivityListener.hasListener) {
-                        purchasingService.getUserData()
-                        purchasingService.getPurchaseUpdates(false)
-                    }
-                }
-
-                override fun onHostPause() {}
-
-                override fun onHostDestroy() {
+        val lifecycleEventListener: LifecycleEventListener = object : LifecycleEventListener {
+            /**
+             * From https://developer.amazon.com/docs/in-app-purchasing/iap-implement-iap.html#getpurchaseupdates-responses
+             * We should fetch updates on resume
+             */
+            override fun onHostResume() {
+                if (RNIapActivityListener.hasListener) {
+                    purchasingService.getUserData()
+                    purchasingService.getPurchaseUpdates(false)
                 }
             }
+            override fun onHostPause() {}
+            override fun onHostDestroy() {
+            }
+        }
         reactContext.addLifecycleEventListener(lifecycleEventListener)
     }
 }

package/android/src/amazon/java/com/dooboolab/rniap/RNIapPackage.kt

@@ -7,7 +7,10 @@ import com.facebook.react.uimanager.ViewManager
 import java.util.ArrayList
 
 class RNIapPackage : ReactPackage {
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> = emptyList()
+
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return emptyList()
+    }
 
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
         val modules: MutableList<NativeModule> = ArrayList()

package/android/src/main/java/com/dooboolab/rniap/PromiseUtils.kt

@@ -6,18 +6,11 @@ import java.util.HashMap
 
 object PromiseUtils {
     private val promises = HashMap<String, MutableList<Promise>>()
-
-    fun addPromiseForKey(
-        key: String,
-        promise: Promise,
-    ) {
+    fun addPromiseForKey(key: String, promise: Promise) {
         promises.getOrPut(key) { mutableListOf() }.add(promise)
     }
 
-    fun resolvePromisesForKey(
-        key: String,
-        value: Any?,
-    ) {
+    fun resolvePromisesForKey(key: String, value: Any?) {
         promises[key]?.forEach { promise ->
             promise.safeResolve(value)
         }

package/android/src/main/java/com/dooboolab/rniap/PromiseUtlis.kt

@@ -21,21 +21,12 @@ fun Promise.safeResolve(value: Any?) {
 
 fun Promise.safeReject(message: String) = this.safeReject(message, null, null)
 
-fun Promise.safeReject(
-    code: String?,
-    message: String?,
-) = this.safeReject(code, message, null)
-
-fun Promise.safeReject(
-    code: String?,
-    throwable: Throwable?,
-) = this.safeReject(code, null, throwable)
-
-fun Promise.safeReject(
-    code: String?,
-    message: String?,
-    throwable: Throwable?,
-) {
+fun Promise.safeReject(code: String?, message: String?) = this.safeReject(code, message, null)
+
+fun Promise.safeReject(code: String?, throwable: Throwable?) =
+    this.safeReject(code, null, throwable)
+
+fun Promise.safeReject(code: String?, message: String?, throwable: Throwable?) {
     try {
         this.reject(code, message, throwable)
     } catch (oce: ObjectAlreadyConsumedException) {

package/android/src/play/java/com/dooboolab/rniap/PlayUtils.kt

@@ -4,104 +4,88 @@ import android.util.Log
 import com.android.billingclient.api.BillingClient
 import com.facebook.react.bridge.Promise
 
-data class BillingResponse(
-    val code: String,
-    val message: String,
-)
+data class BillingResponse(val code: String, val message: String)
 
 object PlayUtils {
-    fun rejectPromiseWithBillingError(
-        promise: Promise,
-        responseCode: Int,
-    ) {
+    fun rejectPromiseWithBillingError(promise: Promise, responseCode: Int) {
         val errorData = getBillingResponseData(responseCode)
         promise.safeReject(errorData.code, errorData.message)
     }
 
     fun getBillingResponseData(responseCode: Int): BillingResponse {
-        val errorData =
-            when (responseCode) {
-                BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED -> {
-                    BillingResponse(
-                        PromiseUtils.E_SERVICE_ERROR,
-                        "This feature is not available on your device.",
-                    )
-                }
-                BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> {
-                    BillingResponse(
-                        PromiseUtils.E_NETWORK_ERROR,
-                        "The service is disconnected (check your internet connection.)",
-                    )
-                }
-                BillingClient.BillingResponseCode.NETWORK_ERROR -> {
-                    BillingResponse(
-                        PromiseUtils.E_NETWORK_ERROR,
-                        "You have problem with network connection.",
-                    )
-                }
-                BillingClient.BillingResponseCode.OK -> {
-                    BillingResponse(
-                        "OK",
-                        "",
-                    )
-                }
-                BillingClient.BillingResponseCode.USER_CANCELED -> {
-                    BillingResponse(
-                        PromiseUtils.E_USER_CANCELLED,
-                        "Payment is Cancelled.",
-                    )
-                }
-                BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE -> {
-                    BillingResponse(
-                        PromiseUtils.E_SERVICE_ERROR,
-                        "The service is unreachable. This may be your internet connection, or the Play Store may be down.",
-                    )
-                }
-                BillingClient.BillingResponseCode.BILLING_UNAVAILABLE -> {
-                    BillingResponse(
-                        PromiseUtils.E_SERVICE_ERROR,
-                        "Billing is unavailable. This may be a problem with your device, or the Play Store may be down.",
-                    )
-                }
-                BillingClient.BillingResponseCode.ITEM_UNAVAILABLE -> {
-                    BillingResponse(
-                        PromiseUtils.E_ITEM_UNAVAILABLE,
-                        "That item is unavailable.",
-                    )
-                }
-                BillingClient.BillingResponseCode.DEVELOPER_ERROR -> {
-                    BillingResponse(
-                        PromiseUtils.E_DEVELOPER_ERROR,
-                        "Google is indicating that we have some issue connecting to payment.",
-                    )
-                }
-                BillingClient.BillingResponseCode.ERROR -> {
-                    BillingResponse(
-                        PromiseUtils.E_UNKNOWN,
-                        "An unknown or unexpected error has occurred. Please try again later.",
-                    )
-                }
-                BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
-                    BillingResponse(
-                        PromiseUtils.E_ALREADY_OWNED,
-                        "You already own this item.",
-                    )
-                }
-                else -> {
-                    BillingResponse(
-                        PromiseUtils.E_UNKNOWN,
-                        "Purchase failed with code: $responseCode",
-                    )
-                }
+        val errorData = when (responseCode) {
+            BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED -> {
+                BillingResponse(
+                    PromiseUtils.E_SERVICE_ERROR,
+                    "This feature is not available on your device.",
+                )
             }
+            BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> {
+                BillingResponse(
+                    PromiseUtils.E_NETWORK_ERROR,
+                    "The service is disconnected (check your internet connection.)",
+                )
+            }
+            BillingClient.BillingResponseCode.OK -> {
+                BillingResponse(
+                    "OK",
+                    "",
+                )
+            }
+            BillingClient.BillingResponseCode.USER_CANCELED -> {
+                BillingResponse(
+                    PromiseUtils.E_USER_CANCELLED,
+                    "Payment is Cancelled.",
+                )
+            }
+            BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE -> {
+                BillingResponse(
+                    PromiseUtils.E_SERVICE_ERROR,
+                    "The service is unreachable. This may be your internet connection, or the Play Store may be down.",
+                )
+            }
+            BillingClient.BillingResponseCode.BILLING_UNAVAILABLE -> {
+                BillingResponse(
+                    PromiseUtils.E_SERVICE_ERROR,
+                    "Billing is unavailable. This may be a problem with your device, or the Play Store may be down.",
+                )
+            }
+            BillingClient.BillingResponseCode.ITEM_UNAVAILABLE -> {
+                BillingResponse(
+                    PromiseUtils.E_ITEM_UNAVAILABLE,
+                    "That item is unavailable.",
+                )
+            }
+            BillingClient.BillingResponseCode.DEVELOPER_ERROR -> {
+                BillingResponse(
+                    PromiseUtils.E_DEVELOPER_ERROR,
+                    "Google is indicating that we have some issue connecting to payment.",
+                )
+            }
+            BillingClient.BillingResponseCode.ERROR -> {
+                BillingResponse(
+                    PromiseUtils.E_UNKNOWN,
+                    "An unknown or unexpected error has occurred. Please try again later.",
+                )
+            }
+            BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
+                BillingResponse(
+                    PromiseUtils.E_ALREADY_OWNED,
+                    "You already own this item.",
+                )
+            }
+            else -> {
+                BillingResponse(
+                    PromiseUtils.E_UNKNOWN,
+                    "Purchase failed with code: $responseCode",
+                )
+            }
+        }
         Log.e(TAG, "Error Code : $responseCode")
         return errorData
     }
 
-    fun rejectPromisesWithBillingError(
-        key: String,
-        responseCode: Int,
-    ) {
+    fun rejectPromisesWithBillingError(key: String, responseCode: Int) {
         val errorData = getBillingResponseData(responseCode)
         PromiseUtils.rejectPromisesForKey(key, errorData.code, errorData.message, null)
     }