- Added support for consumables.

- Cleaned the code a bit. - Added facility to support parameters more flexibly.
akshaaatt · Apr 17, 2021 · 1d43099 · 1d43099
1 parent 40c1892
commit 1d43099
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 27 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.alphelios.richierich"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 9
-        versionName "1.0.8"
+        versionCode 12
+        versionName "1.1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/src/main/java/com/alphelios/richierich/MainActivity.kt b/app/src/main/java/com/alphelios/richierich/MainActivity.kt
@@ -18,15 +18,17 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
 
         binding.bottomnavview.itemIconTintList = null
 
-        val skuList = listOf("base", "moderate", "quite", "plenty", "yearly")
+        val nonConsumablesList = listOf("base")
+        val consumablesList = listOf("base", "moderate", "quite", "plenty", "yearly")
         val subsList = listOf("subscription")
 
         val iapConnector = IapConnector(
-            this,
-            skuList,
-            subsList,
-            "LICENSE KEY",
-            true
+            context = this,
+            nonConsumableKeys = nonConsumablesList,
+            consumableKeys = consumablesList,
+            subscriptionKeys = subsList,
+            key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh09sfdDzMhCh3AG9mq2EsyFUN72FBKabPpMsJyUUwXVsVJRLDWQYKmWnr0bVGsdVHwQtEDi//EY1NubXjCmViAxFnnfbdUrAk9PbRRTaMQ4taifn9fCaQ6XAW70ju3/mXuL+1xX+r8B0O9B373sP0YqiUs0b8HTtTjQoOGtcGb2KlYpQlJjjtISfVpsSk2RdKatkDyeesv+6568O7xgb5zp/KNJk8d1fMqKGWJiveFkZvedDh1ECdi3rSz1aQB+z/aEf6AIiuLzu0V8NNKjvZnxUjVJgL+lcLDrL1YZuKx9h5BX7k8lPZI7fLIVE6b6iNx3msfVdiqPkZ3s49JxA1QIDAQAB",
+            enableLogging = true
         )
 
         iapConnector.addPurchaseListener(object : PurchaseServiceListener {
@@ -55,7 +57,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
             }
 
             override fun onProductRestored(sku: String?) {
-                // will be triggered fetching owned products using IAPManager.init();
+                // will be triggered fetching owned products using IapConnector;
             }
         })
 

diff --git a/iap/build.gradle b/iap/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 30
-        versionCode 12
-        versionName "1.1.1"
+        versionCode 13
+        versionName "1.1.2"
     }
 
     buildTypes {

diff --git a/iap/src/main/java/com/alphelios/iap/BillingService.kt b/iap/src/main/java/com/alphelios/iap/BillingService.kt
@@ -8,7 +8,8 @@ import android.util.Log
 import com.android.billingclient.api.*
 
 class BillingService(private val context: Context,
-                     private val inAppSkuKeys: List<String>,
+                     private val nonConsumableKeys: List<String>,
+                     private val consumableKeys: List<String>,
                      private val subscriptionSkuKeys: List<String>)
     : IBillingService(), PurchasesUpdatedListener, BillingClientStateListener, AcknowledgePurchaseResponseListener {
 
@@ -29,9 +30,11 @@ class BillingService(private val context: Context,
     override fun onBillingSetupFinished(billingResult: BillingResult) {
         log("onBillingSetupFinished: billingResult: $billingResult")
         if (billingResult.isOk()) {
-            inAppSkuKeys.querySkuDetails(BillingClient.SkuType.INAPP) {
-                subscriptionSkuKeys.querySkuDetails(BillingClient.SkuType.SUBS) {
-                    queryPurchases()
+            nonConsumableKeys.querySkuDetails(BillingClient.SkuType.INAPP) {
+                consumableKeys.querySkuDetails(BillingClient.SkuType.INAPP) {
+                    subscriptionSkuKeys.querySkuDetails(BillingClient.SkuType.SUBS) {
+                        queryPurchases()
+                    }
                 }
             }
         }
@@ -143,7 +146,26 @@ class BillingService(private val context: Context,
                     val skuDetails = skusDetails[purchase.sku]
                     when (skuDetails?.type) {
                         BillingClient.SkuType.INAPP -> {
-                            productOwned(purchase.sku, isRestore)
+                            /**
+                             * Consume the purchase
+                             */
+                            if(consumableKeys.contains(purchase.sku)){
+                                mBillingClient.consumeAsync(
+                                    ConsumeParams.newBuilder().setPurchaseToken(purchase.purchaseToken).build()
+                                ) { billingResult, _ ->
+                                    when (billingResult.responseCode) {
+                                        BillingClient.BillingResponseCode.OK -> {
+                                            productOwned(purchase.sku, !isRestore)
+                                        }
+                                        else -> {
+                                            Log.d(TAG, "Handling consumables : Error during consumption attempt -> ${billingResult.debugMessage}")
+                                        }
+                                    }
+                                }
+                            }
+                           else{
+                                productOwned(purchase.sku, isRestore)
+                            }
                         }
                         BillingClient.SkuType.SUBS -> {
                             subscriptionOwned(purchase.sku, isRestore)

diff --git a/iap/src/main/java/com/alphelios/iap/IBillingService.kt b/iap/src/main/java/com/alphelios/iap/IBillingService.kt
@@ -27,7 +27,7 @@ abstract class IBillingService {
     }
 
     /**
-     * @param sku       - product specificator
+     * @param sku       - product specifier
      * @param isRestore - a flag indicating whether it's a fresh purchase or restored product
      */
     fun productOwned(sku: String?, isRestore: Boolean) {
@@ -47,7 +47,7 @@ abstract class IBillingService {
     }
 
     /**
-     * @param sku       - subscription specificator
+     * @param sku       - subscription specifier
      * @param isRestore - a flag indicating whether it's a fresh purchase or restored subscription
      */
     fun subscriptionOwned(sku: String, isRestore: Boolean) {

diff --git a/iap/src/main/java/com/alphelios/iap/IapConnector.kt b/iap/src/main/java/com/alphelios/iap/IapConnector.kt
@@ -1,6 +1,5 @@
 package com.alphelios.iap
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 
@@ -15,18 +14,18 @@ class IapConnector @JvmOverloads constructor
  */
     (
     context: Context,
-    iapKeys: List<String>,
+    nonConsumableKeys: List<String>,
+    consumableKeys: List<String>,
     subscriptionKeys: List<String> = emptyList(),
     key: String? = null,
     enableLogging: Boolean = false
 ) {
 
-    @SuppressLint("StaticFieldLeak")
     private var mBillingService: IBillingService? = null
 
     init {
         val contextLocal = context.applicationContext ?: context
-        mBillingService = BillingService(contextLocal, iapKeys, subscriptionKeys)
+        mBillingService = BillingService(contextLocal, nonConsumableKeys, consumableKeys, subscriptionKeys)
         getBillingService().init(key)
         getBillingService().enableDebugLogging(enableLogging)
     }
@@ -65,7 +64,7 @@ class IapConnector @JvmOverloads constructor
 
     fun getBillingService(): IBillingService {
         return mBillingService ?: let {
-            throw RuntimeException("Call IAPManager.build to initialize billing service")
+            throw RuntimeException("Call IapConnector to initialize billing service")
         }
     }
 }
diff --git a/iap/src/main/java/com/alphelios/iap/PurchaseServiceListener.kt b/iap/src/main/java/com/alphelios/iap/PurchaseServiceListener.kt
@@ -11,14 +11,14 @@ interface PurchaseServiceListener : BillingServiceListener {
     /**
      * Callback will be triggered when a product purchased successfully
      *
-     * @param sku - specificator of owned product
+     * @param sku - specifier of owned product
      */
     fun onProductPurchased(sku: String?)
 
     /**
      * Callback will be triggered upon owned products restore
      *
-     * @param sku - specificator of owned product
+     * @param sku - specifier of owned product
      */
     fun onProductRestored(sku: String?)
 }
diff --git a/iap/src/main/java/com/alphelios/iap/SubscriptionServiceListener.kt b/iap/src/main/java/com/alphelios/iap/SubscriptionServiceListener.kt
@@ -4,14 +4,14 @@ interface SubscriptionServiceListener : BillingServiceListener {
     /**
      * Callback will be triggered upon owned subscription restore
      *
-     * @param sku - specificator of owned subscription
+     * @param sku - specifier of owned subscription
      */
     fun onSubscriptionRestored(sku: String?)
 
     /**
      * Callback will be triggered when a subscription purchased successfully
      *
-     * @param sku - specificator of purchased subscription
+     * @param sku - specifier of purchased subscription
      */
     fun onSubscriptionPurchased(sku: String?)
 }