Merge branch 'main' into update_google_billitng

hyochan · Aug 26, 2024 · cd9e53b · cd9e53b
2 parents 11dca13 + 57baba2
commit cd9e53b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## 5.7.0
 * update android billing library v7 
 * 
+## 5.6.2
+* On android for inapp products. Fixed NullPointerException: offerToken is required for constructing ProductDetailsParams
 ## 5.6.1
 * Erroneous duplicate item by @deakjahn in https://github.com/dooboolab-community/flutter_inapp_purchase/pull/441
 * Fixed consumable products reading on Android by @33-Elephants in https://github.com/dooboolab-community/flutter_inapp_purchase/pull/439

diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt
@@ -537,9 +537,10 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler,
                 if (offerToken == null) {
                     offerToken = selectedProductDetails.subscriptionOfferDetails!![0].offerToken
                 }
-
-                productDetailsParamsBuilder.setOfferToken(offerToken)
+            } else {
+                offerToken = selectedProductDetails.subscriptionOfferDetails!![0].offerToken
             }
+            productDetailsParamsBuilder.setOfferToken(offerToken)
 
             val productDetailsParamsList = listOf(productDetailsParamsBuilder.build())