First Draft of updated modules and files.

bboothe-branch · bboothe-branch · commit 121bd4e3d11b · 2025-12-19T15:53:53.000-05:00
diff --git a/Branch-SDK/build.gradle.kts b/Branch-SDK/build.gradle.kts
@@ -38,10 +38,12 @@ dependencies {
     compileOnly("store.galaxy.samsung.installreferrer:samsung_galaxystore_install_referrer:4.0.0")
     // Xiaomi install referrer
     compileOnly("com.miui.referrer:homereferrer:1.0.0.7")
+    //implementation(project(":BranchGooglePlayBillingV8"))
 
-    // Google Play Billing library
     compileOnly("com.android.billingclient:billing:6.0.1")
 
+    // Google Play Billing library
+
     // In app browser experience
     compileOnly("androidx.browser:browser:1.8.0")
 
diff --git a/Branch-SDK/src/androidTest/java/io/branch/referral/BillingGooglePlayTests.kt b/Branch-SDK/src/androidTest/java/io/branch/referral/BillingGooglePlayTests.kt
@@ -2,6 +2,7 @@ package io.branch.referral
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.billingclient.api.Purchase
+import com.example.branchgoogleplaybillingv8.BillingV8
 import io.branch.referral.util.CurrencyType
 
 import org.junit.Assert
@@ -25,7 +26,7 @@ class BillingGooglePlayTests : BranchTest() {
             "XDFlSNC9Gqs+PPmO3xOFdLMaQ4FbsBEpTxBuOd+6adEEcz5Uovlgep+F5Xbr08+x/xzCEyNzybDYDcNg/PTzwfoK6Aeq44mocW4CPA1w/r1rdmgtwBD8nAdWIr3BbwXmcl6LYEGA6dL0N+/3zzjNzK/VWdqXazSdRyXxtlHnx8wsBFdPCBs1e9LtEwUcganA6ot0ttO2ySCKYNne2pEm2ScU+uuWZqZJ00VM7KH9pT+SKOOlSs6rRuFEvbGsoPUdybZQ0WoiXg6JD2hz9/35mQJF4Lkjh2kVgTh5MV4sCNnbMuUmhX/d09+pK2Fw6xiUng3FClOetFV9MaTtsmbz/g=="
         val mockPurchase = Purchase(purchaseJsonString, purchaseSignature)
 
-        BillingGooglePlay.getInstance().createAndLogEventForPurchase(testContext, mockPurchase, listOf(), CurrencyType.USD, 99.99, "IAP")
+        BillingV8.getInstance().createAndLogEventForPurchase(testContext, mockPurchase, listOf(), CurrencyType.USD, 99.99, "IAP")
 
         val queue = ServerRequestQueue.getInstance(testContext)
         val eventRequest = queue.peekAt(0)
diff --git a/Branch-SDK/src/main/java/io/branch/interfaces/GooglePlayBillingWrapper.kt b/Branch-SDK/src/main/java/io/branch/interfaces/GooglePlayBillingWrapper.kt
@@ -0,0 +1,9 @@
+package io.branch.interfaces
+
+import android.content.Context
+
+interface GooglePlayBillingWrapper {
+    fun connect()
+    fun logEventWithPurchase(context: Context, purchase: Any)
+}
+
diff --git a/Branch-SDK/src/main/java/io/branch/referral/Branch.java b/Branch-SDK/src/main/java/io/branch/referral/Branch.java
@@ -6,7 +6,6 @@
 import static io.branch.referral.Defines.Jsonkey.EXTERNAL_BROWSER;
 import static io.branch.referral.Defines.Jsonkey.IN_APP_WEBVIEW;
 import static io.branch.referral.PrefHelper.isValidBranchKey;
-import static io.branch.referral.util.DependencyUtilsKt.billingGooglePlayClass;
 import static io.branch.referral.util.DependencyUtilsKt.classExists;
 
 import android.app.Activity;
@@ -50,6 +49,7 @@
 import java.util.concurrent.TimeoutException;
 
 import io.branch.indexing.BranchUniversalObject;
+import io.branch.interfaces.GooglePlayBillingWrapper;
 import io.branch.interfaces.IBranchLoggingCallbacks;
 import io.branch.referral.Defines.PreinstallKey;
 import io.branch.referral.ServerRequestGetLATD.BranchLastAttributedTouchDataListener;
@@ -2652,16 +2652,25 @@ public static void notifyNativeToInit(){
         }
     }
 
+    private GooglePlayBillingWrapper billingHandler = null;
     public void logEventWithPurchase(@NonNull Context context, @NonNull Purchase purchase) {
-        if (classExists(billingGooglePlayClass)) {
-            BillingGooglePlay.Companion.getInstance().startBillingClient(succeeded -> {
-                if (succeeded) {
-                    BillingGooglePlay.Companion.getInstance().logEventWithPurchase(context, purchase);
-                } else {
-                    BranchLogger.e("Cannot log IAP event. Billing client setup failed");                }
-                return null;
-            });
-        }
+        // New Code Begins
+        billingHandler = GooglePlayBillingManager.INSTANCE.getBillingImplementation();
+
+        if (billingHandler != null) {
+            billingHandler.connect();
+        }
+        // New Code Ends
+
+//        if (classExists(billingGooglePlayClass)) {
+//            BillingV6.Companion.getInstance().startBillingClient(succeeded -> {
+//                if (succeeded) {
+//                    BillingV6.Companion.getInstance().logEventWithPurchase(context, purchase);
+//                } else {
+//                    BranchLogger.e("Cannot log IAP event. Billing client setup failed");                }
+//                return null;
+//            });
+//        }
     }
 
     /**
diff --git a/Branch-SDK/src/main/java/io/branch/referral/GooglePlayBillingLibraryV6.kt b/Branch-SDK/src/main/java/io/branch/referral/GooglePlayBillingLibraryV6.kt
@@ -1,23 +1,33 @@
 package io.branch.referral
 
 import android.content.Context
-import com.android.billingclient.api.*
+import com.android.billingclient.api.BillingClient
+import com.android.billingclient.api.BillingResult
+import com.android.billingclient.api.ProductDetails
+import com.android.billingclient.api.Purchase
+import com.android.billingclient.api.BillingClientStateListener
+import com.android.billingclient.api.PurchasesUpdatedListener
+import com.android.billingclient.api.QueryProductDetailsParams
 import io.branch.indexing.BranchUniversalObject
-import io.branch.referral.util.*
+import io.branch.referral.util.BRANCH_STANDARD_EVENT
+import io.branch.referral.util.BranchContentSchema
+import io.branch.referral.util.BranchEvent
+import io.branch.referral.util.ContentMetadata
+import io.branch.referral.util.CurrencyType
 import java.math.BigDecimal
 
-class BillingGooglePlay private constructor() {
+class GooglePlayBillingLibraryV6 private constructor() {
 
     lateinit var billingClient: BillingClient
 
     companion object {
         @Volatile
-        private lateinit var instance: BillingGooglePlay
+        private lateinit var instance: GooglePlayBillingLibraryV6
 
-        fun getInstance(): BillingGooglePlay {
+        fun getInstance(): GooglePlayBillingLibraryV6 {
             synchronized(this) {
                 if (!::instance.isInitialized) {
-                    instance = BillingGooglePlay()
+                    instance = GooglePlayBillingLibraryV6()
 
                     instance.billingClient =
                         BillingClient.newBuilder(Branch.getInstance().applicationContext)
diff --git a/Branch-SDK/src/main/java/io/branch/referral/GooglePlayBillingManager.kt b/Branch-SDK/src/main/java/io/branch/referral/GooglePlayBillingManager.kt
@@ -0,0 +1,24 @@
+package io.branch.referral
+
+import io.branch.interfaces.GooglePlayBillingWrapper
+
+object GooglePlayBillingManager {
+    fun getBillingImplementation(): GooglePlayBillingWrapper? {
+        // Try to load V8 first
+        try {
+            val clazz = Class.forName("com.branch.billing.v8.BillingV8Implementation")
+            return clazz.getConstructor().newInstance() as GooglePlayBillingWrapper
+        } catch (e: ClassNotFoundException) {
+            // V8 not found, try V6
+        }
+
+        try {
+            val clazz = Class.forName("com.branch.billing.v6.BillingV6Implementation")
+            return clazz.getConstructor().newInstance() as GooglePlayBillingWrapper
+        } catch (e: ClassNotFoundException) {
+            // Neither version is linked in the user's app
+            BranchLogger.e("No Billing Library dependency found!")
+            return null
+        }
+    }
+}
diff --git a/BranchGooglePlayBillingV6/.gitignore b/BranchGooglePlayBillingV6/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/BranchGooglePlayBillingV6/build.gradle.kts b/BranchGooglePlayBillingV6/build.gradle.kts
@@ -0,0 +1,48 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "com.example.branchgoogleplaybillingv6"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.17.0")
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("com.google.android.material:material:1.13.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.3.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
+    // Google Play Billing library
+    compileOnly("com.android.billingclient:billing:6.0.1")
+
+    // Branch SDK Implementations
+    implementation(project(":Branch-SDK"))
+}
diff --git a/BranchGooglePlayBillingV6/consumer-rules.pro b/BranchGooglePlayBillingV6/consumer-rules.pro
diff --git a/BranchGooglePlayBillingV6/proguard-rules.pro b/BranchGooglePlayBillingV6/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/BranchGooglePlayBillingV6/src/androidTest/java/com/example/branchgoogleplaybillingv6/ExampleInstrumentedTest.kt b/BranchGooglePlayBillingV6/src/androidTest/java/com/example/branchgoogleplaybillingv6/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.example.branchgoogleplaybillingv6
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.branchgoogleplaybillinglibrary.test", appContext.packageName)
+    }
+}
diff --git a/BranchGooglePlayBillingV6/src/main/AndroidManifest.xml b/BranchGooglePlayBillingV6/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/BranchGooglePlayBillingV6/src/main/java/com/example/branchgoogleplaybillingv6/BillingV6Implementation.kt b/BranchGooglePlayBillingV6/src/main/java/com/example/branchgoogleplaybillingv6/BillingV6Implementation.kt
@@ -0,0 +1,7 @@
+package com.example.branchgoogleplaybillingv6
+
+class BillingV6Implementation {
+    override fun connect() {
+
+    }
+}
diff --git a/BranchGooglePlayBillingV6/src/test/java/com/example/branchgoogleplaybillingv6/ExampleUnitTest.kt b/BranchGooglePlayBillingV6/src/test/java/com/example/branchgoogleplaybillingv6/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.example.branchgoogleplaybillingv6
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
diff --git a/BranchGooglePlayBillingV8/.gitignore b/BranchGooglePlayBillingV8/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/BranchGooglePlayBillingV8/build.gradle.kts b/BranchGooglePlayBillingV8/build.gradle.kts
@@ -0,0 +1,48 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "com.example.branchgoogleplaybillingv8"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.17.0")
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("com.google.android.material:material:1.13.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.3.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
+    // Google Play Billing library
+    compileOnly("com.android.billingclient:billing:8.0.0")
+
+    // Branch SDK Implementations
+    implementation(project(":Branch-SDK"))
+}
diff --git a/BranchGooglePlayBillingV8/consumer-rules.pro b/BranchGooglePlayBillingV8/consumer-rules.pro
diff --git a/BranchGooglePlayBillingV8/proguard-rules.pro b/BranchGooglePlayBillingV8/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/BranchGooglePlayBillingV8/src/androidTest/java/com/example/branchgoogleplaybillingv8/ExampleInstrumentedTest.kt b/BranchGooglePlayBillingV8/src/androidTest/java/com/example/branchgoogleplaybillingv8/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.example.branchgoogleplaybillingv8
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.branchgoogleplaybillingv8.test", appContext.packageName)
+    }
+}
diff --git a/BranchGooglePlayBillingV8/src/main/AndroidManifest.xml b/BranchGooglePlayBillingV8/src/main/AndroidManifest.xml
diff --git a/BranchGooglePlayBillingV8/src/main/java/com/example/branchgoogleplaybillingv8/BillingV8.kt b/BranchGooglePlayBillingV8/src/main/java/com/example/branchgoogleplaybillingv8/BillingV8.kt
diff --git a/BranchGooglePlayBillingV8/src/main/java/com/example/branchgoogleplaybillingv8/BillingV8Implementation.kt b/BranchGooglePlayBillingV8/src/main/java/com/example/branchgoogleplaybillingv8/BillingV8Implementation.kt
diff --git a/BranchGooglePlayBillingV8/src/test/java/com/example/branchgoogleplaybillingv8/ExampleUnitTest.kt b/BranchGooglePlayBillingV8/src/test/java/com/example/branchgoogleplaybillingv8/ExampleUnitTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
