react-native-iap 12.1.2 → 12.3.0

package/RNIap.podspec

@@ -1,7 +1,6 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_version = '2021.06.28.00-v2'
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
@@ -30,7 +29,7 @@ Pod::Spec.new do |s|
     }
 
     s.dependency "React-Codegen"
-    s.dependency "RCT-Folly", folly_version
+    s.dependency "RCT-Folly"
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"

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

@@ -21,7 +21,6 @@ import java.lang.NumberFormatException
 import java.util.ArrayList
 
 class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingListener {
-    val TAG = "RNIapAmazonListener"
     private val skus: MutableList<Product>
     private var availableItems: WritableNativeArray
     private var availableItemsType: String?
@@ -47,7 +46,7 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                     var priceNumber: Number = 0.00
                     val priceString = product.price
                     try {
-                        if (priceString?.isNotEmpty()== true) {
+                        if (priceString?.isNotEmpty() == true) {
                             priceNumber = priceString.replace("[^\\d.,]+".toRegex(), "").toDouble()
                         }
                     } catch (e: NumberFormatException) {
@@ -73,14 +72,14 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                     }
                     items.pushMap(item)
                 }
-                DoobooUtils.instance
+                PromiseUtils
                     .resolvePromisesForKey(
                         RNIapAmazonModule.PROMISE_GET_PRODUCT_DATA,
                         items
                     )
             }
             ProductDataResponse.RequestStatus.FAILED ->
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_GET_PRODUCT_DATA,
                         E_PRODUCT_DATA_RESPONSE_FAILED,
@@ -88,7 +87,7 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                         null
                     )
             ProductDataResponse.RequestStatus.NOT_SUPPORTED ->
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_GET_PRODUCT_DATA,
                         E_PRODUCT_DATA_RESPONSE_NOT_SUPPORTED,
@@ -100,8 +99,8 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
 
     override fun onPurchaseUpdatesResponse(response: PurchaseUpdatesResponse) {
         // Info for potential error reporting
-        var debugMessage: String? = null
-        var errorCode = DoobooUtils.E_UNKNOWN
+        val debugMessage: String?
+        var errorCode = PromiseUtils.E_UNKNOWN
         val error = Arguments.createMap()
         when (response.requestStatus) {
             PurchaseUpdatesResponse.RequestStatus.SUCCESSFUL -> {
@@ -124,18 +123,18 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                     PurchasingService.getPurchaseUpdates(false)
                 } else {
                     if (purchases.size > 0 && promiseItem != null) {
-                        DoobooUtils.instance
+                        PromiseUtils
                             .resolvePromisesForKey(
                                 RNIapAmazonModule.PROMISE_BUY_ITEM,
                                 promiseItem
                             )
                     }
-                    DoobooUtils.instance
+                    PromiseUtils
                         .resolvePromisesForKey(
                             RNIapAmazonModule.PROMISE_QUERY_PURCHASES,
                             true
                         )
-                    DoobooUtils.instance
+                    PromiseUtils
                         .resolvePromisesForKey(
                             RNIapAmazonModule.PROMISE_QUERY_AVAILABLE_ITEMS,
                             availableItems
@@ -146,20 +145,20 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
             }
             PurchaseUpdatesResponse.RequestStatus.FAILED -> {
                 debugMessage = "An unknown or unexpected error has occured. Please try again later."
-                errorCode = DoobooUtils.E_UNKNOWN
+                errorCode = PromiseUtils.E_UNKNOWN
                 error.putInt("responseCode", 0)
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
                 sendEvent(reactContext, "purchase-error", error)
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_QUERY_PURCHASES,
                         errorCode,
                         debugMessage,
                         null
                     )
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_QUERY_AVAILABLE_ITEMS,
                         errorCode,
@@ -171,20 +170,20 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
             }
             PurchaseUpdatesResponse.RequestStatus.NOT_SUPPORTED -> {
                 debugMessage = "This feature is not available on your device."
-                errorCode = DoobooUtils.E_SERVICE_ERROR
+                errorCode = PromiseUtils.E_SERVICE_ERROR
                 error.putInt("responseCode", 0)
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
                 sendEvent(reactContext, "purchase-error", error)
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_QUERY_PURCHASES,
                         errorCode,
                         debugMessage,
                         null
                     )
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_QUERY_AVAILABLE_ITEMS,
                         errorCode,
@@ -207,7 +206,7 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
         item.putString("userMarketplaceAmazon", userData.marketplace)
         item.putString("userJsonAmazon", userData.toJSON().toString())
         item.putBoolean("isCanceledAmazon", receipt.isCanceled)
-        item.putString("termSku",receipt.termSku)
+        item.putString("termSku", receipt.termSku)
         return item
     }
 
@@ -217,8 +216,8 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
         val status = response.requestStatus
 
         // Info for potential error reporting
-        var debugMessage: String? = null
-        var errorCode = DoobooUtils.E_UNKNOWN
+        val debugMessage: String?
+        var errorCode = PromiseUtils.E_UNKNOWN
         val error = Arguments.createMap()
         when (status) {
             PurchaseResponse.RequestStatus.SUCCESSFUL -> {
@@ -228,7 +227,7 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                 val promiseItem: WritableMap = WritableNativeMap()
                 promiseItem.merge(item)
                 sendEvent(reactContext, "purchase-updated", item)
-                DoobooUtils.instance
+                PromiseUtils
                     .resolvePromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
                         promiseItem
@@ -236,13 +235,13 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
             }
             PurchaseResponse.RequestStatus.ALREADY_PURCHASED -> {
                 debugMessage = "You already own this item."
-                errorCode = DoobooUtils.E_ALREADY_OWNED
+                errorCode = PromiseUtils.E_ALREADY_OWNED
                 error.putInt("responseCode", 0)
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
                 sendEvent(reactContext, "purchase-error", error)
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
                         errorCode,
@@ -253,13 +252,13 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
             PurchaseResponse.RequestStatus.FAILED -> {
                 debugMessage =
                     "An unknown or unexpected error has occurred. Please try again later."
-                errorCode = DoobooUtils.E_UNKNOWN
+                errorCode = PromiseUtils.E_UNKNOWN
                 error.putInt("responseCode", 0)
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
                 sendEvent(reactContext, "purchase-error", error)
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
                         errorCode,
@@ -269,13 +268,13 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
             }
             PurchaseResponse.RequestStatus.INVALID_SKU -> {
                 debugMessage = "That item is unavailable."
-                errorCode = DoobooUtils.E_ITEM_UNAVAILABLE
+                errorCode = PromiseUtils.E_ITEM_UNAVAILABLE
                 error.putInt("responseCode", 0)
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
                 sendEvent(reactContext, "purchase-error", error)
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
                         errorCode,
@@ -285,13 +284,13 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
             }
             PurchaseResponse.RequestStatus.NOT_SUPPORTED -> {
                 debugMessage = "This feature is not available on your device."
-                errorCode = DoobooUtils.E_SERVICE_ERROR
+                errorCode = PromiseUtils.E_SERVICE_ERROR
                 error.putInt("responseCode", 0)
                 error.putString("debugMessage", debugMessage)
                 error.putString("code", errorCode)
                 error.putString("message", debugMessage)
                 sendEvent(reactContext, "purchase-error", error)
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_BUY_ITEM,
                         errorCode,
@@ -310,11 +309,11 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                 item.putString("userIdAmazon", userData.userId)
                 item.putString("userMarketplaceAmazon", userData.marketplace)
                 item.putString("userJsonAmazon", userData.toJSON().toString())
-                DoobooUtils.instance
+                PromiseUtils
                     .resolvePromisesForKey(RNIapAmazonModule.PROMISE_GET_USER_DATA, item)
             }
             UserDataResponse.RequestStatus.NOT_SUPPORTED ->
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_GET_USER_DATA,
                         E_USER_DATA_RESPONSE_NOT_SUPPORTED,
@@ -322,7 +321,7 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                         null
                     )
             UserDataResponse.RequestStatus.FAILED ->
-                DoobooUtils.instance
+                PromiseUtils
                     .rejectPromisesForKey(
                         RNIapAmazonModule.PROMISE_GET_USER_DATA,
                         E_USER_DATA_RESPONSE_FAILED,
@@ -331,9 +330,8 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                     )
         }
     }
-    fun clear(){
+    fun clear() {
         skus.clear()
-
     }
 
     private fun sendEvent(
@@ -360,6 +358,7 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
         private const val E_PURCHASE_RESPONSE_INVALID_SKU = "E_PURCHASE_RESPONSE_INVALID_SKU"
         private const val E_USER_DATA_RESPONSE_FAILED = "E_USER_DATA_RESPONSE_FAILED"
         private const val E_USER_DATA_RESPONSE_NOT_SUPPORTED = "E_USER_DATA_RESPONSE_NOT_SUPPORTED"
+        const val TAG = "RNIapAmazonListener"
     }
 
     init {

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

@@ -1,7 +1,6 @@
 package com.dooboolab.RNIap
 
 import android.util.Log
-import com.amazon.device.drm.LicensingListener
 import com.amazon.device.drm.LicensingService
 import com.amazon.device.drm.model.LicenseResponse
 import com.amazon.device.iap.PurchasingService
@@ -15,7 +14,6 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.module.annotations.ReactModule
 
-
 @ReactModule(name = RNIapAmazonModule.TAG)
 class RNIapAmazonModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
@@ -32,25 +30,26 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
         this.amazonListener = amazonListener
         UiThreadUtil.runOnUiThread {
             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){
+                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)
             }
         }
     }
 
     @ReactMethod
-    fun verifyLicense(promise: Promise){
+    fun verifyLicense(promise: Promise) {
         try {
             LicensingService.verifyLicense(reactApplicationContext) { licenseResponse ->
-                when (val status: LicenseResponse.RequestStatus =
-                    licenseResponse.requestStatus) {
+                when (
+                    val status: LicenseResponse.RequestStatus =
+                        licenseResponse.requestStatus
+                ) {
                     LicenseResponse.RequestStatus.LICENSED -> {
                         Log.d(TAG, "LicenseResponse status: $status")
                         promise.resolve("LICENSED")
@@ -77,14 +76,14 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
                     }
                 }
             }
-        }catch (exception: Exception){
-            promise.reject("Error while attempting to check for License",exception)
+        } catch (exception: Exception) {
+            promise.reject("Error while attempting to check for License", exception)
         }
     }
 
     @ReactMethod
     fun endConnection(promise: Promise) {
-        DoobooUtils.instance.rejectAllPendingPromises()
+        PromiseUtils.rejectAllPendingPromises()
         amazonListener?.clear()
         hasListener = false
         promise.resolve(true)
@@ -93,7 +92,7 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
     @ReactMethod
     fun getUser(promise: Promise) {
         val requestId = PurchasingService.getUserData()
-        DoobooUtils.instance.addPromiseForKey(PROMISE_GET_USER_DATA, promise)
+        PromiseUtils.addPromiseForKey(PROMISE_GET_USER_DATA, promise)
     }
 
     @ReactMethod
@@ -114,13 +113,13 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
             }
             ii++
         }
-        DoobooUtils.instance.addPromiseForKey(PROMISE_GET_PRODUCT_DATA, promise)
+        PromiseUtils.addPromiseForKey(PROMISE_GET_PRODUCT_DATA, promise)
         val requestId = PurchasingService.getProductData(productSkus)
     }
 
     @ReactMethod
     fun getAvailableItems(promise: Promise) {
-        DoobooUtils.instance.addPromiseForKey(PROMISE_QUERY_AVAILABLE_ITEMS, promise)
+        PromiseUtils.addPromiseForKey(PROMISE_QUERY_AVAILABLE_ITEMS, promise)
         PurchasingService.getPurchaseUpdates(true)
     }
 
@@ -129,7 +128,7 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
         sku: String?,
         promise: Promise
     ) {
-        DoobooUtils.instance.addPromiseForKey(PROMISE_BUY_ITEM, promise)
+        PromiseUtils.addPromiseForKey(PROMISE_BUY_ITEM, promise)
         val requestId = PurchasingService.purchase(sku)
     }
 
@@ -154,7 +153,7 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
     }
 
     private fun sendUnconsumedPurchases(promise: Promise) {
-        DoobooUtils.instance.addPromiseForKey(PROMISE_QUERY_PURCHASES, promise)
+        PromiseUtils.addPromiseForKey(PROMISE_QUERY_PURCHASES, promise)
         PurchasingService.getPurchaseUpdates(false)
     }
 

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

@@ -0,0 +1,54 @@
+package com.dooboolab.RNIap
+
+import com.facebook.react.bridge.Promise
+import java.lang.Exception
+import java.util.HashMap
+
+object PromiseUtils {
+    private val promises = HashMap<String, MutableList<Promise>>()
+    fun addPromiseForKey(key: String, promise: Promise) {
+        promises.getOrPut(key) { mutableListOf() }.add(promise)
+    }
+
+    fun resolvePromisesForKey(key: String, value: Any?) {
+        promises[key]?.forEach { promise ->
+            promise.safeResolve(value)
+        }
+        promises.remove(key)
+    }
+
+    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?,
+        message: String?,
+        err: Exception?
+    ) {
+        promises[key]?.forEach { promise ->
+            promise.safeReject(code, message, err)
+        }
+        promises.remove(key)
+    }
+
+    private const val TAG = "PromiseUtils"
+    const val E_UNKNOWN = "E_UNKNOWN"
+    const val E_NOT_PREPARED = "E_NOT_PREPARED"
+    const val E_ALREADY_PREPARED = "E_ALREADY_PREPARED"
+    const val E_NOT_ENDED = "E_NOT_ENDED"
+    const val E_USER_CANCELLED = "E_USER_CANCELLED"
+    const val E_ITEM_UNAVAILABLE = "E_ITEM_UNAVAILABLE"
+    const val E_NETWORK_ERROR = "E_NETWORK_ERROR"
+    const val E_SERVICE_ERROR = "E_SERVICE_ERROR"
+    const val E_ALREADY_OWNED = "E_ALREADY_OWNED"
+    const val E_REMOTE_ERROR = "E_REMOTE_ERROR"
+    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"
+}

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

@@ -11,7 +11,7 @@ import com.facebook.react.bridge.Promise
 
 const val TAG = "IapPromises"
 
-fun Promise.safeResolve(value: Any) {
+fun Promise.safeResolve(value: Any?) {
     try {
         this.resolve(value)
     } catch (oce: ObjectAlreadyConsumedException) {

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

@@ -4,60 +4,81 @@ import android.util.Log
 import com.android.billingclient.api.BillingClient
 import com.facebook.react.bridge.Promise
 
-class PlayUtils {
+data class BillingResponse(val code: String, val message: String)
+
+object PlayUtils {
     fun rejectPromiseWithBillingError(promise: Promise, responseCode: Int) {
         val errorData = getBillingResponseData(responseCode)
-        promise.safeReject(errorData[0], errorData[1])
+        promise.safeReject(errorData.code, errorData.message)
     }
 
-    fun getBillingResponseData(responseCode: Int): Array<String?> {
-        val errorData = arrayOfNulls<String>(2)
-        when (responseCode) {
+    fun getBillingResponseData(responseCode: Int): BillingResponse {
+        val errorData = when (responseCode) {
             BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED -> {
-                errorData[0] = DoobooUtils.E_SERVICE_ERROR
-                errorData[1] = "This feature is not available on your device."
+                BillingResponse(
+                    PromiseUtils.E_SERVICE_ERROR,
+                    "This feature is not available on your device."
+                )
             }
             BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> {
-                errorData[0] = DoobooUtils.E_NETWORK_ERROR
-                errorData[1] = "The service is disconnected (check your internet connection.)"
+                BillingResponse(
+                    PromiseUtils.E_NETWORK_ERROR,
+                    "The service is disconnected (check your internet connection.)"
+                )
             }
             BillingClient.BillingResponseCode.OK -> {
-                errorData[0] = "OK"
-                errorData[1] = ""
+                BillingResponse(
+                    "OK",
+                    ""
+                )
             }
             BillingClient.BillingResponseCode.USER_CANCELED -> {
-                errorData[0] = DoobooUtils.E_USER_CANCELLED
-                errorData[1] = "Payment is Cancelled."
+                BillingResponse(
+                    PromiseUtils.E_USER_CANCELLED,
+                    "Payment is Cancelled."
+                )
             }
             BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE -> {
-                errorData[0] = DoobooUtils.E_SERVICE_ERROR
-                errorData[1] =
+                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 -> {
-                errorData[0] = DoobooUtils.E_SERVICE_ERROR
-                errorData[1] =
+                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 -> {
-                errorData[0] = DoobooUtils.E_ITEM_UNAVAILABLE
-                errorData[1] = "That item is unavailable."
+                BillingResponse(
+                    PromiseUtils.E_ITEM_UNAVAILABLE,
+                    "That item is unavailable."
+                )
             }
             BillingClient.BillingResponseCode.DEVELOPER_ERROR -> {
-                errorData[0] = DoobooUtils.E_DEVELOPER_ERROR
-                errorData[1] = "Google is indicating that we have some issue connecting to payment."
+                BillingResponse(
+                    PromiseUtils.E_DEVELOPER_ERROR,
+                    "Google is indicating that we have some issue connecting to payment."
+                )
             }
             BillingClient.BillingResponseCode.ERROR -> {
-                errorData[0] = DoobooUtils.E_UNKNOWN
-                errorData[1] = "An unknown or unexpected error has occurred. Please try again later."
+                BillingResponse(
+                    PromiseUtils.E_UNKNOWN,
+                    "An unknown or unexpected error has occurred. Please try again later."
+                )
             }
             BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
-                errorData[0] = DoobooUtils.E_ALREADY_OWNED
-                errorData[1] = "You already own this item."
+                BillingResponse(
+                    PromiseUtils.E_ALREADY_OWNED,
+                    "You already own this item."
+                )
             }
             else -> {
-                errorData[0] = DoobooUtils.E_UNKNOWN
-                errorData[1] = "Purchase failed with code: $responseCode"
+                BillingResponse(
+                    PromiseUtils.E_UNKNOWN,
+                    "Purchase failed with code: $responseCode"
+                )
             }
         }
         Log.e(TAG, "Error Code : $responseCode")
@@ -66,12 +87,6 @@ class PlayUtils {
 
     fun rejectPromisesWithBillingError(key: String, responseCode: Int) {
         val errorData = getBillingResponseData(responseCode)
-        DoobooUtils.instance.rejectPromisesForKey(key, errorData[0], errorData[1], null)
-    }
-
-    companion object {
-        private const val TAG = "PlayUtils"
-        const val E_PLAY_SERVICES_UNAVAILABLE = "E_PLAY_SERVICES_UNAVAILABLE"
-        val instance = PlayUtils()
+        PromiseUtils.rejectPromisesForKey(key, errorData.code, errorData.message, null)
     }
 }