Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed consumable product purchase on Android #420

Merged
merged 2 commits into from
Jun 22, 2023
Merged

Fixed consumable product purchase on Android #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcd883c
Fixed consumable product purchase on Android
Apr 9, 2023
fe38344
Fixed 'java.lang.IllegalStateException: Reply already submitted' exce…
Jun 18, 2023
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
23 changes: 13 additions & 10 deletions android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,19 +507,22 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler,

// Get the selected offerToken from the product, or first one if this is a migrated from 4.0 product
// or if the offerTokenIndex was not provided
val productDetailsParamsBuilder = ProductDetailsParams.newBuilder().setProductDetails(selectedProductDetails)
var offerToken : String? = null
if (offerTokenIndex != null) {
offerToken = selectedProductDetails.subscriptionOfferDetails?.get(offerTokenIndex)?.offerToken
}
if (offerToken == null) {
offerToken = selectedProductDetails.subscriptionOfferDetails!![0].offerToken

if (type == BillingClient.ProductType.SUBS) {
if (offerTokenIndex != null) {
offerToken = selectedProductDetails.subscriptionOfferDetails?.get(offerTokenIndex)?.offerToken
}
if (offerToken == null) {
offerToken = selectedProductDetails.subscriptionOfferDetails!![0].offerToken
}

productDetailsParamsBuilder.setOfferToken(offerToken)
}

val productDetailsParamsList =
listOf(ProductDetailsParams.newBuilder()
.setProductDetails(selectedProductDetails)
.setOfferToken(offerToken)
.build())
val productDetailsParamsList = listOf(productDetailsParamsBuilder.build())

builder.setProductDetailsParamsList(productDetailsParamsList)

val params = SubscriptionUpdateParams.newBuilder()
Expand Down
20 changes: 16 additions & 4 deletions android/src/main/kotlin/com/dooboolab/flutterinapppurchase/MethodResultWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.dooboolab.flutterinapppurchase

import android.os.Handler
import io.flutter.plugin.common.MethodChannel
import java.lang.Runnable
import android.os.Looper

// MethodChannel.Result wrapper that responds on the platform thread.
Expand All @@ -11,16 +10,29 @@ class MethodResultWrapper internal constructor(
private val safeChannel: MethodChannel
) : MethodChannel.Result {
private val handler: Handler = Handler(Looper.getMainLooper())
private var exhausted: Boolean = false
override fun success(result: Any?) {
handler.post { safeResult.success(result) }
if (!exhausted) {
exhausted = true

handler.post { safeResult.success(result) }
}
}

override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) {
handler.post { safeResult.error(errorCode, errorMessage, errorDetails) }
if (!exhausted) {
exhausted = true

handler.post { safeResult.error(errorCode, errorMessage, errorDetails) }
}
}

override fun notImplemented() {
handler.post { safeResult.notImplemented() }
if (!exhausted) {
exhausted = true

handler.post { safeResult.notImplemented() }
}
}

fun invokeMethod(method: String?, arguments: Any?) {
Expand Down