Skip to content
This repository was archived by the owner on Oct 17, 2025. It is now read-only.

Fix Android offer token handling #8

Merged
hyochan merged 1 commit into from
Sep 17, 2025
Merged

Fix Android offer token handling #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions openiap/src/main/java/dev/hyo/openiap/OpenIapModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,19 +169,46 @@ class OpenIapModule(private val context: Context) : OpenIapProtocol, PurchasesUp
fun launchBillingWith(detailsList: List<ProductDetails>) {
// Build params for all requested SKUs in order
val paramsList = mutableListOf<BillingFlowParams.ProductDetailsParams>()
for (pd in detailsList) {
val requestedOffersBySku = mutableMapOf<String, MutableList<String>>()
if (type == ProductRequest.ProductRequestType.Subs) {
request.subscriptionOffers.forEach { offer ->
if (offer.offerToken.isNotEmpty()) {
val queue = requestedOffersBySku.getOrPut(offer.sku) { mutableListOf() }
queue.add(offer.offerToken)
}
}
}

for ((index, pd) in detailsList.withIndex()) {
val builder = BillingFlowParams.ProductDetailsParams.newBuilder()
.setProductDetails(pd)
if (type == ProductRequest.ProductRequestType.Subs) {
val offerToken = pd.subscriptionOfferDetails?.firstOrNull()?.offerToken
if (offerToken.isNullOrEmpty()) {
Log.w(TAG, "No subscription offer available for ${pd.productId}")
val availableOfferTokens = pd.subscriptionOfferDetails?.map { it.offerToken } ?: emptyList()
val requestedTokenFromQueue = requestedOffersBySku[pd.productId]?.let { queue ->
if (queue.isNotEmpty()) queue.removeAt(0) else null
}
val requestedTokenFromIndex = request.subscriptionOffers.getOrNull(index)?.takeIf { it.sku == pd.productId }?.offerToken
val resolvedOfferToken = requestedTokenFromQueue
?: requestedTokenFromIndex
?: pd.subscriptionOfferDetails?.firstOrNull()?.offerToken

if (resolvedOfferToken.isNullOrEmpty()) {
OpenIapLog.w("No subscription offer available for ${pd.productId}", TAG)
val err = OpenIapError.SkuOfferMismatch
purchaseErrorListeners.forEach { runCatching { it.onPurchaseError(err) } }
currentPurchaseCallback?.invoke(Result.success(emptyList()))
return
}
builder.setOfferToken(offerToken)

if (availableOfferTokens.isNotEmpty() && !availableOfferTokens.contains(resolvedOfferToken)) {
OpenIapLog.w("Requested offerToken=$resolvedOfferToken not found for ${pd.productId}", TAG)
val err = OpenIapError.SkuOfferMismatch
purchaseErrorListeners.forEach { runCatching { it.onPurchaseError(err) } }
currentPurchaseCallback?.invoke(Result.success(emptyList()))
return
}

builder.setOfferToken(resolvedOfferToken)
}
paramsList.add(builder.build())
}
Expand Down Expand Up @@ -244,7 +271,7 @@ class OpenIapModule(private val context: Context) : OpenIapProtocol, PurchasesUp
launchBillingWith(ordered)
// Do not complete here; wait for onPurchasesUpdated
} else {
Log.w(TAG, "queryProductDetails failed: code=${billingResult.responseCode} msg=${billingResult.debugMessage}")
OpenIapLog.w("queryProductDetails failed: code=${billingResult.responseCode} msg=${billingResult.debugMessage}", TAG)
val err = OpenIapError.QueryProduct()
purchaseErrorListeners.forEach { runCatching { it.onPurchaseError(err) } }
currentPurchaseCallback?.invoke(Result.success(emptyList()))
Expand Down Expand Up @@ -397,7 +424,7 @@ class OpenIapModule(private val context: Context) : OpenIapProtocol, PurchasesUp
billingResult.responseCode,
billingResult.debugMessage
)
Log.w(TAG, "Purchase failed: code=${billingResult.responseCode} msg=${error.message}")
OpenIapLog.w("Purchase failed: code=${billingResult.responseCode} msg=${error.message}", TAG)
// Surface framework-specific error upstream (maintains type for UserCancelled, etc.)
purchaseErrorListeners.forEach { listener ->
runCatching { listener.onPurchaseError(error) }
Expand Down Expand Up @@ -569,9 +596,9 @@ class OpenIapModule(private val context: Context) : OpenIapProtocol, PurchasesUp
object : BillingClientStateListener {
override fun onBillingSetupFinished(billingResult: BillingResult) {
if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
Log.w(
TAG,
OpenIapLog.w(
"Billing setup finished with error: ${billingResult.debugMessage}",
TAG,
)
onFailure(IllegalStateException(billingResult.debugMessage ?: "Billing setup failed"))
return
Expand Down
3 changes: 2 additions & 1 deletion openiap/src/main/java/dev/hyo/openiap/models/OpenIapRequestTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ data class RequestPurchaseParams(
val skus: List<String>,
val obfuscatedAccountIdAndroid: String? = null,
val obfuscatedProfileIdAndroid: String? = null,
val isOfferPersonalized: Boolean? = null
val isOfferPersonalized: Boolean? = null,
val subscriptionOffers: List<RequestSubscriptionAndroidProps.SubscriptionOffer> = emptyList()
)

/**
Expand Down
Loading