chore: rebase main

Author: hyochan

openiap/src/horizon/java/dev/hyo/openiap/horizon/OpenIapHorizonModule.kt

@@ -10,6 +10,7 @@ import com.meta.horizon.billingclient.api.BillingFlowParams
 import com.meta.horizon.billingclient.api.BillingResult
 import com.meta.horizon.billingclient.api.ConsumeParams
 import com.meta.horizon.billingclient.api.GetBillingConfigParams
+import com.meta.horizon.billingclient.api.PendingPurchasesParams
 import com.meta.horizon.billingclient.api.ProductDetails as HorizonProductDetails
 import com.meta.horizon.billingclient.api.Purchase as HorizonPurchase
 import com.meta.horizon.billingclient.api.PurchasesUpdatedListener
@@ -469,13 +470,34 @@ class OpenIapHorizonModule(
     }
 
     private fun buildBillingClient() {
+        val pendingPurchasesParams = com.meta.horizon.billingclient.api.PendingPurchasesParams.newBuilder()
+            .enableOneTimeProducts()
+            .build()
+
         val builder = BillingClient
             .newBuilder(context)
             .setListener(this)
-            .enablePendingPurchases()
+            .enablePendingPurchases(pendingPurchasesParams)
         if (!appId.isNullOrEmpty()) {
             builder.setAppId(appId)
         }
         billingClient = builder.build()
     }
+
+    // Alternative Billing (Google Play only - not supported on Horizon)
+    override suspend fun checkAlternativeBillingAvailability(): Boolean {
+        throw OpenIapError.FeatureNotSupported
+    }
+
+    override suspend fun showAlternativeBillingInformationDialog(activity: Activity): Boolean {
+        throw OpenIapError.FeatureNotSupported
+    }
+
+    override suspend fun createAlternativeBillingReportingToken(): String? {
+        throw OpenIapError.FeatureNotSupported
+    }
+
+    override fun setUserChoiceBillingListener(listener: dev.hyo.openiap.listener.UserChoiceBillingListener?) {
+        // Not supported on Horizon
+    }
 }

openiap/src/main/java/dev/hyo/openiap/OpenIapModule.kt

@@ -236,7 +236,7 @@ class OpenIapModule(
      * Check if alternative billing is available for this user/device
      * Step 1 of alternative billing flow
      */
-    suspend fun checkAlternativeBillingAvailability(): Boolean = withContext(Dispatchers.IO) {
+    override suspend fun checkAlternativeBillingAvailability(): Boolean = withContext(Dispatchers.IO) {
         val client = billingClient ?: throw OpenIapError.NotPrepared
         if (!client.isReady) throw OpenIapError.NotPrepared
 
@@ -275,7 +275,7 @@ class OpenIapModule(
      * Step 2 of alternative billing flow
      * Must be called BEFORE processing payment
      */
-    suspend fun showAlternativeBillingInformationDialog(activity: Activity): Boolean = withContext(Dispatchers.IO) {
+    override suspend fun showAlternativeBillingInformationDialog(activity: Activity): Boolean = withContext(Dispatchers.IO) {
         val client = billingClient ?: throw OpenIapError.NotPrepared
         if (!client.isReady) throw OpenIapError.NotPrepared
 
@@ -323,7 +323,7 @@ class OpenIapModule(
      * Must be called AFTER successful payment in your payment system
      * Token must be reported to Google Play backend within 24 hours
      */
-    suspend fun createAlternativeBillingReportingToken(): String? = withContext(Dispatchers.IO) {
+    override suspend fun createAlternativeBillingReportingToken(): String? = withContext(Dispatchers.IO) {
         val client = billingClient ?: throw OpenIapError.NotPrepared
         if (!client.isReady) throw OpenIapError.NotPrepared
 
@@ -1055,7 +1055,7 @@ class OpenIapModule(
      *
      * @param listener User choice billing listener
      */
-    fun setUserChoiceBillingListener(listener: dev.hyo.openiap.listener.UserChoiceBillingListener?) {
+    override fun setUserChoiceBillingListener(listener: dev.hyo.openiap.listener.UserChoiceBillingListener?) {
         userChoiceBillingListener = listener
     }
 }

openiap/src/main/java/dev/hyo/openiap/OpenIapProtocol.kt

@@ -35,4 +35,10 @@ interface OpenIapProtocol {
     fun removePurchaseUpdateListener(listener: OpenIapPurchaseUpdateListener)
     fun addPurchaseErrorListener(listener: OpenIapPurchaseErrorListener)
     fun removePurchaseErrorListener(listener: OpenIapPurchaseErrorListener)
+
+    // Alternative Billing (Google Play only)
+    suspend fun checkAlternativeBillingAvailability(): Boolean
+    suspend fun showAlternativeBillingInformationDialog(activity: Activity): Boolean
+    suspend fun createAlternativeBillingReportingToken(): String?
+    fun setUserChoiceBillingListener(listener: dev.hyo.openiap.listener.UserChoiceBillingListener?)
 }

openiap/src/play/java/dev/hyo/openiap/horizon/OpenIapHorizonModule.kt

@@ -102,4 +102,21 @@ class OpenIapHorizonModule(
     override fun removePurchaseErrorListener(listener: OpenIapPurchaseErrorListener) {
         delegate.removePurchaseErrorListener(listener)
     }
+
+    // Alternative Billing (delegate to OpenIapModule)
+    override suspend fun checkAlternativeBillingAvailability(): Boolean {
+        return delegate.checkAlternativeBillingAvailability()
+    }
+
+    override suspend fun showAlternativeBillingInformationDialog(activity: Activity): Boolean {
+        return delegate.showAlternativeBillingInformationDialog(activity)
+    }
+
+    override suspend fun createAlternativeBillingReportingToken(): String? {
+        return delegate.createAlternativeBillingReportingToken()
+    }
+
+    override fun setUserChoiceBillingListener(listener: dev.hyo.openiap.listener.UserChoiceBillingListener?) {
+        delegate.setUserChoiceBillingListener(listener)
+    }
 }