chore: rebase main

Author: hyochan

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

@@ -56,6 +56,7 @@ import dev.hyo.openiap.SubscriptionPurchaseErrorHandler
 import dev.hyo.openiap.SubscriptionPurchaseUpdatedHandler
 import dev.hyo.openiap.listener.OpenIapPurchaseErrorListener
 import dev.hyo.openiap.listener.OpenIapPurchaseUpdateListener
+import dev.hyo.openiap.listener.OpenIapUserChoiceBillingListener
 import dev.hyo.openiap.helpers.onPurchaseError
 import dev.hyo.openiap.helpers.onPurchaseUpdated
 import dev.hyo.openiap.helpers.toAndroidPurchaseArgs
@@ -500,4 +501,12 @@ class OpenIapHorizonModule(
     override fun setUserChoiceBillingListener(listener: dev.hyo.openiap.listener.UserChoiceBillingListener?) {
         // Not supported on Horizon
     }
+
+    override fun addUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener) {
+        // Not supported on Horizon
+    }
+
+    override fun removeUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener) {
+        // Not supported on Horizon
+    }
 }

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

@@ -843,11 +843,11 @@ class OpenIapModule(
         purchaseErrorListeners.remove(listener)
     }
 
-    fun addUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener) {
+    override fun addUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener) {
         userChoiceBillingListeners.add(listener)
     }
 
-    fun removeUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener) {
+    override fun removeUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener) {
         userChoiceBillingListeners.remove(listener)
     }
 

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

@@ -3,6 +3,7 @@ package dev.hyo.openiap
 import android.app.Activity
 import dev.hyo.openiap.listener.OpenIapPurchaseErrorListener
 import dev.hyo.openiap.listener.OpenIapPurchaseUpdateListener
+import dev.hyo.openiap.listener.OpenIapUserChoiceBillingListener
 
 /**
  * Shared contract implemented by platform-specific OpenIAP billing modules.
@@ -41,4 +42,6 @@ interface OpenIapProtocol {
     suspend fun showAlternativeBillingInformationDialog(activity: Activity): Boolean
     suspend fun createAlternativeBillingReportingToken(): String?
     fun setUserChoiceBillingListener(listener: dev.hyo.openiap.listener.UserChoiceBillingListener?)
+    fun addUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener)
+    fun removeUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener)
 }

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

@@ -22,6 +22,7 @@ import dev.hyo.openiap.QueryHasActiveSubscriptionsHandler
 import dev.hyo.openiap.SubscriptionHandlers
 import dev.hyo.openiap.listener.OpenIapPurchaseErrorListener
 import dev.hyo.openiap.listener.OpenIapPurchaseUpdateListener
+import dev.hyo.openiap.listener.OpenIapUserChoiceBillingListener
 
 /**
  * Play flavor stub that reuses the Play Billing pipeline.
@@ -119,4 +120,12 @@ class OpenIapHorizonModule(
     override fun setUserChoiceBillingListener(listener: dev.hyo.openiap.listener.UserChoiceBillingListener?) {
         delegate.setUserChoiceBillingListener(listener)
     }
+
+    override fun addUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener) {
+        delegate.addUserChoiceBillingListener(listener)
+    }
+
+    override fun removeUserChoiceBillingListener(listener: OpenIapUserChoiceBillingListener) {
+        delegate.removeUserChoiceBillingListener(listener)
+    }
 }