Partydeck/IAP-Extension-Mirror
3
0
Fork 0
mirror of https://github.com/defold/extension-iap synced 2025-06-27 10:27:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added null checks

Browse Source
This commit is contained in:
Björn Ritzl 2023-02-06 15:56:03 +01:00
parent f97a7ee6b6
commit d74c97d5c7
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extension-iap/src/java/com/defold/iap/IapGooglePlay.java
View File

@ -362,11 +362,15 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
*/ */
@Override @Override
public void onPurchasesUpdated(BillingResult billingResult, List<Purchase> purchases) { public void onPurchasesUpdated(BillingResult billingResult, List<Purchase> purchases) {
if (billingResult.getResponseCode() == BillingResponseCode.OK && purchases != null) { if (billingResult.getResponseCode() == BillingResponseCode.OK) {
if (purchases != null && !purchases.isEmpty()) {
for (Purchase purchase : purchases) { for (Purchase purchase : purchases) {
if (purchase != null) {
handlePurchase(purchase, this.purchaseListener); handlePurchase(purchase, this.purchaseListener);
} }
} }
}
}
else { else {
this.purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), ""); this.purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
} }
@ -413,7 +417,12 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
@Override @Override
public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetailsList) { public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetailsList) {
if (billingResult.getResponseCode() == BillingResponseCode.OK && (productDetailsList != null) && !productDetailsList.isEmpty()) { if (billingResult.getResponseCode() == BillingResponseCode.OK && (productDetailsList != null) && !productDetailsList.isEmpty()) {
buyProduct(productDetailsList.get(0), token, purchaseListener); for (ProductDetails productDetails : productDetailsList) {
if (productDetails != null) {
buyProduct(productDetails, token, purchaseListener);
break;
}
}
} }
else { else {
Log.e(TAG, "Unable to get product details before buying: " + billingResult.getDebugMessage()); Log.e(TAG, "Unable to get product details before buying: " + billingResult.getDebugMessage());
@ -435,11 +444,13 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
@Override @Override
public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetails) { public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetails) {
if (productDetails != null) { if (productDetails != null && !productDetails.isEmpty()) {
// cache products (cache will be used to speed up buying) // cache products (cache will be used to speed up buying)
for (ProductDetails pd : productDetails) { for (ProductDetails pd : productDetails) {
if (pd != null) {
IapGooglePlay.this.products.put(pd.getProductId(), pd); IapGooglePlay.this.products.put(pd.getProductId(), pd);
} }
}
// add to list of all product details // add to list of all product details
allProductDetails.addAll(productDetails); allProductDetails.addAll(productDetails);
} }
@ -485,11 +496,13 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
@Override @Override
public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetails) { public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetails) {
JSONArray a = new JSONArray(); JSONArray a = new JSONArray();
if (billingResult.getResponseCode() == BillingResponseCode.OK) { if ((billingResult.getResponseCode() == BillingResponseCode.OK) && (productDetails != null) && !productDetails.isEmpty()) {
for (ProductDetails pd : productDetails) { for (ProductDetails pd : productDetails) {
if (pd != null) {
a.put(convertProductDetails(pd)); a.put(convertProductDetails(pd));
} }
} }
}
else { else {
Log.e(TAG, "Unable to list products: " + billingResult.getDebugMessage()); Log.e(TAG, "Unable to list products: " + billingResult.getDebugMessage());
} }

2
game.project
View File

@ -16,7 +16,7 @@ target_sdk_version = 29
[project] [project]
title = extension-iap title = extension-iap
dependencies = https://github.com/andsve/dirtylarry/archive/master.zip dependencies#0 = https://github.com/andsve/dirtylarry/archive/master.zip
[library] [library]
include_dirs = extension-iap include_dirs = extension-iap