- Downgrade to billing v7.0.0

README.md

@@ -37,7 +37,7 @@ Add Funsol Billing Helper dependencies in App level build.gradle.
 ```kotlin
 
 dependencies {
-  implementation 'com.github.Funsol-Projects:Funsol-Billing-Helper:v2.0.3'
+  implementation 'com.github.Funsol-Projects:Funsol-Billing-Helper:v2.0.5'
 }
 
 ```  

funsol-billing-utils/build.gradle

@@ -56,13 +56,13 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.Funsol-Projects'
                 artifactId = 'Funsol-Billing-Helper'
-                version = 'v2.0.4'
+                version = 'v2.0.5'
             }
             debug(MavenPublication) {
                 from components.debug
                 groupId = 'com.github.Funsol-Projects'
                 artifactId = 'Funsol-Billing-Helper'
-                version = 'v2.0.4'
+                version = 'v2.0.5'
             }
         }
     }

funsol-billing-utils/src/main/java/com/funsol/iap/billing/FunSolBillingHelper.kt

@@ -26,6 +26,7 @@ import com.funsol.iap.billing.helper.billingPrefernces.BillingSharedPrefsManager
 import com.funsol.iap.billing.helper.billingPrefernces.PurchasedHistoryUtils
 import com.funsol.iap.billing.helper.billingPrefernces.PurchasedProduct
 import com.funsol.iap.billing.helper.logFunsolBilling
+import com.funsol.iap.billing.helper.toFunsolPurchases
 import com.funsol.iap.billing.listeners.BillingClientListener
 import com.funsol.iap.billing.listeners.BillingEventListener
 import com.funsol.iap.billing.model.ErrorType
@@ -235,7 +236,7 @@ class FunSolBillingHelper(private val context: Context) {
 									buyProducts.handlePurchase(purchase = purchase)
 								}
 							}
-							billingEventListener?.onProductsPurchased(purchasedSubsProductList)
+							billingEventListener?.onProductsPurchased(purchasedSubsProductList.toFunsolPurchases())
 						}
 					}
 

funsol-billing-utils/src/main/java/com/funsol/iap/billing/helper/BuyProducts.kt

@@ -84,8 +84,7 @@ class BuyProducts {
 						type = productInfo.productType,
 						price = productPriceInfo.price,
 						priceMicro = productPriceInfo.priceMicro,
-						currencyCode = productPriceInfo.currencyCode,
-						currencySymbol = productPriceInfo.currencySymbol)
+						currencyCode = productPriceInfo.currencyCode)
 				}
 
 			} else {
@@ -210,7 +209,7 @@ class BuyProducts {
 					else                            -> logFunsolBilling("Unknown product type while acknowledging purchase")
 				}
 				billingClientListener?.onPurchasesUpdated()
-				billingEventListener?.onPurchaseAcknowledged(purchase)
+				billingEventListener?.onPurchaseAcknowledged(purchase.toFunsolPurchase())
 			} else {
 				logFunsolBilling("Acknowledge error: ${result.debugMessage} (code: ${result.responseCode})")
 				billingEventListener?.onBillingError(ErrorType.ACKNOWLEDGE_ERROR)
@@ -236,7 +235,7 @@ class BuyProducts {
 		billingClient.consumeAsync(consumeParams) { result, _ ->
 			if (result.responseCode == BillingClient.BillingResponseCode.OK) {
 				logFunsolBilling("Purchase consumed")
-				billingEventListener?.onPurchaseConsumed(purchase)
+				billingEventListener?.onPurchaseConsumed(purchase.toFunsolPurchase())
 			} else {
 				logFunsolBilling("Failed to consume purchase: ${result.debugMessage} (code: ${result.responseCode})")
 				billingEventListener?.onBillingError(ErrorType.CONSUME_ERROR)

funsol-billing-utils/src/main/java/com/funsol/iap/billing/helper/TypeExtensions.kt

@@ -1,2 +1,43 @@
 package com.funsol.iap.billing.helper
 
+import com.android.billingclient.api.Purchase
+import com.funsol.iap.billing.model.FunsolPurchase
+
+fun List<Purchase>.toFunsolPurchases(): List<FunsolPurchase> {
+    return this.map { purchase ->
+        FunsolPurchase(
+            products = purchase.products.toMutableList(),
+            purchaseState = purchase.purchaseState,
+            purchaseToken = purchase.purchaseToken,
+            isAcknowledged = purchase.isAcknowledged,
+            packageName = purchase.packageName,
+            developerPayload = purchase.developerPayload,
+            isAutoRenewing = purchase.isAutoRenewing,
+            orderId = purchase.orderId,
+            originalJson = purchase.originalJson,
+            purchaseTime = purchase.purchaseTime,
+            quantity = purchase.quantity,
+            signature = purchase.signature,
+            skus = purchase.skus
+        )
+    }
+}
+
+fun Purchase.toFunsolPurchase(): FunsolPurchase {
+    return FunsolPurchase(
+        products = this.products.toMutableList(),
+        purchaseState = this.purchaseState,
+        purchaseToken = this.purchaseToken,
+        isAcknowledged = this.isAcknowledged,
+        packageName = this.packageName,
+        developerPayload = this.developerPayload,
+        isAutoRenewing = this.isAutoRenewing,
+        orderId = this.orderId,
+        originalJson = this.originalJson,
+        purchaseTime = this.purchaseTime,
+        quantity = this.quantity,
+        signature = this.signature,
+        skus = this.skus
+
+    )
+}

funsol-billing-utils/src/main/java/com/funsol/iap/billing/helper/billingPrefernces/PurchaseDatabase.kt

@@ -5,7 +5,7 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 
-@Database(entities = [PurchasedProduct::class], version = 2, exportSchema = false)
+@Database(entities = [PurchasedProduct::class], version = 1, exportSchema = false)
 abstract class PurchaseDatabase : RoomDatabase() {
     abstract fun purchaseDao(): PurchaseDao
 

funsol-billing-utils/src/main/java/com/funsol/iap/billing/helper/billingPrefernces/PurchasedProduct.kt

@@ -32,6 +32,5 @@ data class PurchasedProduct(
     @ColumnInfo(name = "price") var price: String? = null,
     @ColumnInfo(name = "price_micro") var priceMicro: Long? = null,
     @ColumnInfo(name = "currency_code") var currencyCode: String? = null,
-    @ColumnInfo(name = "currency_symbol") var currencySymbol: String? = null,
     @ColumnInfo(name = "purchase_time") var purchaseTime: Long = System.currentTimeMillis(),
 )

funsol-billing-utils/src/main/java/com/funsol/iap/billing/listeners/BillingEventListener.kt

@@ -1,13 +1,11 @@
 package com.funsol.iap.billing.listeners
 
-import com.android.billingclient.api.Purchase
 import com.funsol.iap.billing.model.ErrorType
-
+import com.funsol.iap.billing.model.FunsolPurchase
 
 interface BillingEventListener {
-    fun onProductsPurchased(purchases: List<Purchase?>)
-    fun onPurchaseAcknowledged(purchase: Purchase)
-    fun onPurchaseConsumed(purchase: Purchase)
+    fun onProductsPurchased(purchases: List<FunsolPurchase?>)
+    fun onPurchaseAcknowledged(purchase: FunsolPurchase)
+    fun onPurchaseConsumed(purchase: FunsolPurchase)
     fun onBillingError(error: ErrorType)
-
 }

funsol-billing-utils/src/main/java/com/funsol/iap/billing/model/ProductPriceInfo.kt

@@ -14,6 +14,5 @@ data class ProductPriceInfo(
     var price: String = "",
     var priceMicro: Long = 0L,
     var currencyCode: String = "",
-    var currencySymbol: String = "",
     var productCompleteInfo: ProductDetails? = null
 )