draft PR of all updates so far

brboothe1 · brboothe1 · commit 92990929fdd9 · 2025-09-25T09:54:41.000-04:00
diff --git a/Branch-SDK/build.gradle.kts b/Branch-SDK/build.gradle.kts
@@ -13,11 +13,12 @@ jacoco {
     toolVersion = "0.8.10"
 }
 
-configurations.all {
-    resolutionStrategy {
-        force("com.android.billingclient:billing:5.0.0")
-    }
-}
+//configurations.all {
+//    resolutionStrategy {
+//        force("com.android.billingclient:billing:8.0.0")
+//    }
+//}
+
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to "*.jar")))
     implementation(kotlin("stdlib"))
@@ -140,6 +141,18 @@ android {
     signing {
         isRequired = isReleaseBuild()
     }
+
+    flavorDimensions.add("billing")
+
+    productFlavors {
+        create("billing_v6v7") {
+            dimension = "billing"
+        }
+        create("billing_v8") {
+            dimension = "billing"
+        }
+    }
+
 }
 
 fun getRepositoryUsername(): String {
diff --git a/Branch-SDK/src/BillingGooglePlayModules/BillingV6/BillingGooglePlayV6V7.kt b/Branch-SDK/src/BillingGooglePlayModules/BillingV6/BillingGooglePlayV6V7.kt
@@ -0,0 +1,163 @@
+package io.branch.referral
+
+import android.content.Context
+import com.android.billingclient.api.*
+import io.branch.indexing.BranchUniversalObject
+import io.branch.referral.util.*
+import java.math.BigDecimal
+
+class BillingGooglePlayV6V7 : BillingGooglePlayInterface {
+    lateinit var billingClient: BillingClient
+
+    companion object {
+        @Volatile
+        private lateinit var instance: BillingGooglePlay
+
+        fun getInstance(): BillingGooglePlay {
+            synchronized(this) {
+                if (!::instance.isInitialized) {
+                    instance = BillingGooglePlay()
+
+                    instance.billingClient =
+                        BillingClient.newBuilder(Branch.getInstance().applicationContext)
+                            .setListener(instance.purchasesUpdatedListener)
+                            .enablePendingPurchases()
+                            .build()
+                }
+                return instance
+            }
+        }
+    }
+
+
+    override fun startBillingClient(callback: (Boolean) -> Unit) {
+        if (billingClient.isReady) {
+            BranchLogger.v("Billing Client has already been started..")
+            callback(true)
+        } else {
+            billingClient.startConnection(object : BillingClientStateListener {
+                override fun onBillingSetupFinished(billingResult: BillingResult) {
+                    if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                        BranchLogger.v("Billing Client setup finished.")
+                        callback(true)
+                    } else {
+                        val errorMessage =
+                            "Billing Client setup failed with error: ${billingResult.debugMessage}"
+                        BranchLogger.e(errorMessage)
+                        callback(false)
+                    }
+                }
+
+                override fun onBillingServiceDisconnected() {
+                    BranchLogger.w("Billing Client disconnected")
+                    callback(false)
+                }
+            })
+        }
+    }
+
+    override fun logEventWithPurchase(
+        context: Context,
+        purchase: Purchase
+    ) {
+        val productIds = purchase.products
+        val productList: MutableList<QueryProductDetailsParams.Product> = ArrayList()
+        val subsList: MutableList<QueryProductDetailsParams.Product> = ArrayList()
+
+        for (productId: String? in productIds) {
+            val inAppProduct = QueryProductDetailsParams.Product.newBuilder()
+                .setProductId(productId!!)
+                .setProductType(BillingClient.ProductType.INAPP)
+                .build()
+            productList.add(inAppProduct)
+
+            val subsProduct = QueryProductDetailsParams.Product.newBuilder()
+                .setProductId(productId)
+                .setProductType(BillingClient.ProductType.SUBS)
+                .build()
+            subsList.add(subsProduct)
+        }
+
+        val queryProductDetailsParams = QueryProductDetailsParams.newBuilder()
+            .setProductList(productList)
+            .build()
+
+        val querySubsProductDetailsParams = QueryProductDetailsParams.newBuilder()
+            .setProductList(subsList)
+            .build()
+
+        billingClient.queryProductDetailsAsync(
+            querySubsProductDetailsParams
+        ) { billingResult: BillingResult, subsProductDetailsList: List<ProductDetails?> ->
+            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                val contentItemBUOs: MutableList<BranchUniversalObject> =
+                    ArrayList()
+                var currency: CurrencyType = CurrencyType.USD
+                var revenue = 0.00
+
+                for (product: ProductDetails? in subsProductDetailsList) {
+                    val buo: BranchUniversalObject = createBUOWithSubsProductDetails(product)
+                    contentItemBUOs.add(buo)
+
+                    revenue += buo.contentMetadata.price
+                    currency = buo.contentMetadata.currencyType
+                }
+
+                if (contentItemBUOs.isNotEmpty()) {
+                    createAndLogEventForPurchase(
+                        context,
+                        purchase,
+                        contentItemBUOs,
+                        currency,
+                        revenue,
+                        BillingClient.ProductType.SUBS
+                    )
+                }
+            }
+            else {
+                BranchLogger.e("Failed to query subscriptions. Error: " + billingResult.debugMessage)
+            }
+        }
+
+        billingClient.queryProductDetailsAsync(
+            queryProductDetailsParams
+        ) { billingResult: BillingResult, productDetailsList: List<ProductDetails?> ->
+            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+
+                val contentItemBUOs: MutableList<BranchUniversalObject> =
+                    ArrayList()
+                var currency: CurrencyType = CurrencyType.USD
+                var revenue = 0.00
+                val quantity: Int = purchase.quantity
+
+                for (product: ProductDetails? in productDetailsList) {
+                    val buo: BranchUniversalObject =
+                        createBUOWithInAppProductDetails(product, quantity)
+                    contentItemBUOs.add(buo)
+
+                    revenue += (BigDecimal(buo.contentMetadata.price.toString()) * BigDecimal(
+                        quantity.toString()
+                    )).toDouble()
+                    currency = buo.contentMetadata.currencyType
+                }
+
+                if (contentItemBUOs.isNotEmpty()) {
+                    createAndLogEventForPurchase(
+                        context,
+                        purchase,
+                        contentItemBUOs,
+                        currency,
+                        revenue,
+                        BillingClient.ProductType.INAPP
+                    )
+                }
+            }
+            else {
+                BranchLogger.e("Failed to query subscriptions. Error: " + billingResult.debugMessage)
+            }
+        }
+    }
+
+
+
+}
diff --git a/Branch-SDK/src/BillingGooglePlayModules/BillingV6/build.gradle b/Branch-SDK/src/BillingGooglePlayModules/BillingV6/build.gradle
@@ -0,0 +1,40 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    compileSdk ANDROID_BUILD_SDK_VERSION_COMPILE.toInt() // Or your project's compile SDK version
+
+    defaultConfig {
+        minSdk = ANDROID_BUILD_SDK_VERSION_MINIMUM.toInt()
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("proguard-consumer.txt")
+    }
+
+    // This section is for library-specific configurations
+    buildTypes {
+        fun String.wrapInQuotes(): String {
+            return "\"$this\""
+        }
+
+        debug {
+            enableUnitTestCoverage = true
+            enableAndroidTestCoverage = true
+            buildConfigField("long", "VERSION_CODE", VERSION_CODE)
+            buildConfigField("String", "VERSION_NAME", VERSION_NAME.wrapInQuotes())
+        }
+        release {
+            buildConfigField("long", "VERSION_CODE", VERSION_CODE)
+            buildConfigField("String", "VERSION_NAME", VERSION_NAME.wrapInQuotes())
+        }
+    }
+}
+
+dependencies {
+    // This is the older V6 version of the billing library
+    implementation 'com.android.billingclient:billing:6.0.1'
+
+    // Add any other dependencies specific to this module
+    implementation 'androidx.core:core-ktx:1.9.0'
+}
diff --git a/Branch-SDK/src/BillingGooglePlayModules/BillingV7V8/BillingGooglePlayV8.kt b/Branch-SDK/src/BillingGooglePlayModules/BillingV7V8/BillingGooglePlayV8.kt
@@ -0,0 +1,17 @@
+package io.branch.referral
+
+import android.content.Context
+import com.android.billingclient.api.*
+
+class BillingGooglePlayV8 : BillingGooglePlayInterface{
+    override fun startBillingClient(context: Context?) {
+        TODO("Not yet implemented")
+    }
+
+    override fun logEventWithPurchase(
+        context: Context?,
+        purchase: Purchase?
+    ) {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/Branch-SDK/src/BillingGooglePlayModules/BillingV7V8/build.gradle b/Branch-SDK/src/BillingGooglePlayModules/BillingV7V8/build.gradle
@@ -0,0 +1,40 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    compileSdk ANDROID_BUILD_SDK_VERSION_COMPILE.toInt() // Or your project's compile SDK version
+
+    defaultConfig {
+        minSdk = ANDROID_BUILD_SDK_VERSION_MINIMUM.toInt()
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("proguard-consumer.txt")
+    }
+
+    // This section is for library-specific configurations
+    buildTypes {
+        fun String.wrapInQuotes(): String {
+            return "\"$this\""
+        }
+
+        debug {
+            enableUnitTestCoverage = true
+            enableAndroidTestCoverage = true
+            buildConfigField("long", "VERSION_CODE", VERSION_CODE)
+            buildConfigField("String", "VERSION_NAME", VERSION_NAME.wrapInQuotes())
+        }
+        release {
+            buildConfigField("long", "VERSION_CODE", VERSION_CODE)
+            buildConfigField("String", "VERSION_NAME", VERSION_NAME.wrapInQuotes())
+        }
+    }
+}
+
+dependencies {
+    // This is the older V6 version of the billing library
+    implementation 'com.android.billingclient:billing:8.0.0'
+
+    // Add any other dependencies specific to this module
+    implementation 'androidx.core:core-ktx:1.9.0'
+}
diff --git a/Branch-SDK/src/billing_v6v7/java/io/branch/referral/BillingGooglePlayReflection.java b/Branch-SDK/src/billing_v6v7/java/io/branch/referral/BillingGooglePlayReflection.java
@@ -0,0 +1,10 @@
+package io.branch.referral;
+
+import io.branch.referral.BillingGooglePlayV6V7;
+import java.lang.ClassNotFoundException;
+
+public class BillingGooglePlayReflection {
+    public static BillingGooglePlayInterface getBillingLibraryVersion() {
+        return new BillingGooglePlayV6V7();
+    }
+}
diff --git a/Branch-SDK/src/billing_v8/java/io/branch/referral/BillingGooglePlayReflection.java b/Branch-SDK/src/billing_v8/java/io/branch/referral/BillingGooglePlayReflection.java
@@ -0,0 +1,10 @@
+package io.branch.referral;
+
+import io.branch.referral.BillingGooglePlayV8;
+import java.lang.ClassNotFoundException;
+
+public class BillingGooglePlayReflection {
+    public static BillingGooglePlayInterface getBillingLibraryVersion() {
+        return new BillingGooglePlayV8();
+    }
+}
diff --git a/Branch-SDK/src/main/java/io/branch/referral/BillingGooglePlayInterface.kt b/Branch-SDK/src/main/java/io/branch/referral/BillingGooglePlayInterface.kt
@@ -0,0 +1,11 @@
+package io.branch.referral;
+
+import android.content.Context;
+import io.branch.referral.util.*;
+
+import com.android.billingclient.api.Purchase;
+
+public interface BillingGooglePlayInterface {
+    fun logEventWithPurchase(context: Context, purchase: Purchase);
+    fun startBillingClient(callback: (Boolean) -> Unit);
+}
diff --git a/Branch-SDK/src/main/java/io/branch/referral/BillingGooglePlayReflection.java b/Branch-SDK/src/main/java/io/branch/referral/BillingGooglePlayReflection.java
@@ -3,43 +3,27 @@
 import java.lang.ClassNotFoundException;
 
 public class BillingGooglePlayReflection {
-    public static String getBillingLibraryVersion() {
+    public static BillingGooglePlayInterface getBillingLibraryVersion() {
         try {
             // Check for a class added in version 8.0 or higher
             Class billingClientBuilderClass = Class.forName("com.android.billingclient.api.BillingClient$Builder");
             billingClientBuilderClass.getMethod("enableAutoServiceReconnection");
-            return "Version 8.0 or higher";
+            return new BillingGooglePlayV8();
         } catch (NoSuchMethodException | ClassNotFoundException version8CheckFailed) {
             try {
                 // Check for a class added in version 7.0 or higher
                 Class.forName("com.android.billingclient.api.ProductDetails$InstallmentPlanDetails");
-                return "Version 7.0 or higher";
+
+                return new BillingGooglePlayV6V7();
             } catch (ClassNotFoundException version7CheckFailed) {
                 try {
                     // Check for a class added in version 6.0 or higher
                     Class.forName("com.android.billingclient.api.BillingFlowParams$SubscriptionUpdateParams$ReplacementMode");
-                    return "Version 6.0 or higher";
+                    return new BillingGooglePlayV6V7();
                 } catch (ClassNotFoundException version6CheckFailed) {
-                    try {
-                        // Check for the ProductDetails class, introduced in version 5.0
-                        Class.forName("com.android.billingclient.api.ProductDetails");
-                        return "Version 5.0 or higher";
-                    } catch (ClassNotFoundException version5CheckFailed) {
-                        try {
-                            // If ProductDetails is not found, check for the older SkuDetails class
-                            Class.forName("com.android.billingclient.api.SkuDetails");
-                            return "Version 4.0 or older";
-                        } catch (ClassNotFoundException version4CheckFailed) {
-                            // If neither class is found, the library is not present or is a very old version
-                            return "Not found or very old version";
-                        }
-                    }
+                    return new BillingGooglePlayV6V7();
                 }
             }
         }
     }
-    public static void main(String[] args) {
-        String version = getBillingLibraryVersion();
-        System.out.println("Detected Google Billing Library Version: " + version);
-    }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,7 @@
 include(":Branch-SDK")
 include(":Branch-SDK-TestBed")
+include (":BillingGooglePlayModules:BillingV6V7", ":BillingGooglePlayModules:BillingV8")
+
 
 pluginManagement {
     repositories {
