added the Billing Google Play V8 updated methods

Author: brboothe1

Branch-SDK/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
     compileOnly("com.miui.referrer:homereferrer:1.0.0.7")
 
     // Google Play Billing library
-    compileOnly("com.android.billingclient:billing:6.0.1")
+    compileOnly("com.android.billingclient:billing:8.0.0")
 
     // In app browser experience
     compileOnly("androidx.browser:browser:1.8.0")

…dules/BillingV6/BillingGooglePlayV6V7.kt …les/BillingV6V7/BillingGooglePlayV6V7.ktBranch-SDK/src/BillingGooglePlayModules/BillingV6/BillingGooglePlayV6V7.kt renamed to Branch-SDK/src/BillingGooglePlayModules/BillingV6V7/BillingGooglePlayV6V7.kt Branch-SDK/src/BillingGooglePlayModules/BillingV6/BillingGooglePlayV6V7.kt renamed to Branch-SDK/src/BillingGooglePlayModules/BillingV6V7/BillingGooglePlayV6V7.kt

@@ -7,6 +7,7 @@ import io.branch.referral.util.*
 import java.math.BigDecimal
 
 class BillingGooglePlayV6V7 : BillingGooglePlayInterface {
+
     lateinit var billingClient: BillingClient
 
     companion object {
@@ -29,8 +30,7 @@ class BillingGooglePlayV6V7 : BillingGooglePlayInterface {
         }
     }
 
-
-    override fun startBillingClient(callback: (Boolean) -> Unit) {
+    fun startBillingClient(callback: (Boolean) -> Unit) {
         if (billingClient.isReady) {
             BranchLogger.v("Billing Client has already been started..")
             callback(true)
@@ -56,10 +56,15 @@ class BillingGooglePlayV6V7 : BillingGooglePlayInterface {
         }
     }
 
-    override fun logEventWithPurchase(
-        context: Context,
-        purchase: Purchase
-    ) {
+    private val purchasesUpdatedListener = PurchasesUpdatedListener { _, _ -> }
+
+    /**
+     * Logs a Branch Commerce Event based on an in-app purchase
+     *
+     * @param context  Current context
+     * @param purchase Respective purchase
+     */
+    fun logEventWithPurchase(context: Context, purchase: Purchase) {
         val productIds = purchase.products
         val productList: MutableList<QueryProductDetailsParams.Product> = ArrayList()
         val subsList: MutableList<QueryProductDetailsParams.Product> = ArrayList()
@@ -158,6 +163,96 @@ class BillingGooglePlayV6V7 : BillingGooglePlayInterface {
         }
     }
 
+    private fun createBUOWithSubsProductDetails(product: ProductDetails?): BranchUniversalObject {
+        if (product != null) {
+
+            val pricingPhaseList =
+                product.subscriptionOfferDetails?.get(0)?.pricingPhases?.pricingPhaseList?.get(0)
+
+            val currency = pricingPhaseList?.let {
+                CurrencyType.valueOf(
+                    it.priceCurrencyCode
+                )
+            }
+
+            val price = pricingPhaseList?.priceAmountMicros?.div(1000000.0)
 
+            val buo = BranchUniversalObject()
+                .setCanonicalIdentifier(product.productId)
+                .setTitle(product.title)
+
+            val contentMetadata = ContentMetadata()
+                .addCustomMetadata("product_type", product.productType)
+                .setProductName(product.name)
+                .setQuantity(1.0)
+                .setContentSchema(BranchContentSchema.COMMERCE_PRODUCT)
+
+            if (price != null && currency != null) {
+                contentMetadata.setPrice(price, currency);
+            }
+
+            buo.contentMetadata = contentMetadata;
+
+            return buo;
+        } else {
+            return BranchUniversalObject()
+        }
+    }
 
+    private fun createBUOWithInAppProductDetails(
+        product: ProductDetails?,
+        quantity: Int
+    ): BranchUniversalObject {
+        if (product != null) {
+
+            val currency = product.oneTimePurchaseOfferDetails?.priceCurrencyCode?.let {
+                CurrencyType.valueOf(it)
+            }
+            val price = product.oneTimePurchaseOfferDetails?.priceAmountMicros?.div(1000000.0)
+
+            val buo = BranchUniversalObject()
+                .setCanonicalIdentifier(product.productId)
+                .setTitle(product.title)
+
+            val contentMetadata = ContentMetadata()
+                .addCustomMetadata("product_type", product.productType)
+                .setProductName(product.name)
+                .setQuantity(quantity.toDouble())
+                .setContentSchema(BranchContentSchema.COMMERCE_PRODUCT)
+
+            if (price != null && currency != null) {
+                contentMetadata.setPrice(price, currency);
+            }
+
+            buo.contentMetadata = contentMetadata;
+
+            return buo;
+        } else {
+            return BranchUniversalObject()
+        }
+    }
+
+    fun createAndLogEventForPurchase(
+        context: Context,
+        purchase: Purchase,
+        contentItems: List<BranchUniversalObject>,
+        currency: CurrencyType,
+        revenue: Double,
+        productType: String
+    ) {
+        BranchEvent(BRANCH_STANDARD_EVENT.PURCHASE)
+            .setCurrency(currency)
+            .setDescription(purchase.orderId)
+            .setCustomerEventAlias(productType)
+            .setRevenue(revenue)
+            .addCustomDataProperty("package_name", purchase.packageName)
+            .addCustomDataProperty("order_id", purchase.orderId)
+            .addCustomDataProperty("logged_from_IAP", "true")
+            .addCustomDataProperty("is_auto_renewing", purchase.isAutoRenewing.toString())
+            .addCustomDataProperty("purchase_token", purchase.purchaseToken)
+            .addContentItems(contentItems)
+            .logEvent(context)
+
+        BranchLogger.i("Successfully logged in-app purchase as Branch Event")
+    }
 }