Emt 2431 - Draft PR

Branch-SDK/build.gradle.kts

@@ -13,6 +13,12 @@ jacoco {
     toolVersion = "0.8.10"
 }
 
+//configurations.all {
+//    resolutionStrategy {
+//        force("com.android.billingclient:billing:8.0.0")
+//    }
+//}
+
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to "*.jar")))
     implementation(kotlin("stdlib"))
@@ -41,7 +47,6 @@ dependencies {
 
     // Google Play Billing library
     compileOnly("com.android.billingclient:billing:6.0.1")
-
     // In app browser experience
     compileOnly("androidx.browser:browser:1.8.0")
 
@@ -136,6 +141,18 @@ android {
     signing {
         isRequired = isReleaseBuild()
     }
+
+    flavorDimensions.add("billing")
+
+    productFlavors {
+        create("billing_v6v7") {
+            dimension = "billing"
+        }
+        create("billing_v8") {
+            dimension = "billing"
+        }
+    }
+
 }
 
 fun getRepositoryUsername(): String {

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)
+            }
+        }
+    }
+
+
+
+}

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'
+}

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")
+    }
+}

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'
+}

Branch-SDK/src/androidTest/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
+<!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
+<!--    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />-->
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <application>

Branch-SDK/src/androidTest/java/io/branch/referral/BillingGooglePlayTests.kt

@@ -1,11 +1,13 @@
 package io.branch.referral
 
+import android.Manifest
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.GrantPermissionRule
 import com.android.billingclient.api.Purchase
 import io.branch.referral.util.CurrencyType
-
 import org.junit.Assert
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -46,4 +48,14 @@ class BillingGooglePlayTests : BranchTest() {
         )
         Assert.assertTrue(eventRequest.isWaitingOnProcessToFinish)
     }
+
+    @Test
+    fun getBillingLibraryVersionReturnsCorrectVersion() {
+        // Act
+        val version = BillingGooglePlayReflection.getBillingLibraryVersion()
+
+        // Assert
+        //Change the assertion to match the version you have in your build.gradle file
+        Assert.assertEquals("Version 6.0 or higher", version)
+    }
 }

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();
+    }
+}

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();
+    }
+}

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);
+}