Merge pull request #68 from defold/dev-update-to-android-billing-6-0-1

Update to android billing 6.2.1
Update build.gradle
2025-09-27 17:12:18 +02:00 · 2024-07-04 15:18:13 +02:00 · 2024-07-04 15:04:32 +02:00 · 2024-07-04 14:52:58 +02:00 · 2024-07-04 14:36:12 +02:00 · 2024-07-03 19:26:34 +02:00
11 changed files with 164 additions and 32 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ Thumbs.db
 .cproject
 builtins
 _site
+manifest.private.der
+manifest.public.der
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,6 +1,6 @@
 ---
 title: Defold In-app purchase extension API documentation
-brief: This manual covers how to setup and use Google Play Game Services in Defold.
+brief: This manual covers how to setup and use In-App Purchases in Defold.
 ---

 # Defold In-app purchase extension API documentation
--- a/extension-iap/ext.manifest
+++ b/extension-iap/ext.manifest
@@ -1,10 +1,6 @@
 name: IAPExt

 platforms:
-    armv7-ios:
-        context:
-            weakFrameworks: ['StoreKit', 'UIKit', 'Foundation']
-
    arm64-ios:
        context:
            weakFrameworks: ['StoreKit', 'UIKit', 'Foundation']
--- a/extension-iap/lib/web/library_facebook_iap.js
+++ b/extension-iap/lib/web/library_facebook_iap.js
@@ -71,7 +71,7 @@ var LibraryFacebookIAP = {

                    if(url_index == product_count-1) {
                        var productsJSON = JSON.stringify(products);
-                        var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
+                        var res_buf = stringToUTF8OnStack(productsJSON);
                        {{{ makeDynCall('vii', 'callback')}}}(lua_callback, res_buf);
                    } else {
                        var xmlhttp = new XMLHttpRequest();
@@ -143,7 +143,7 @@ var LibraryFacebookIAP = {
 	                    }

 	                    var productsJSON = JSON.stringify(result)
-	                    var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
+	                    var res_buf = stringToUTF8OnStack(productsJSON);
 	                    {{{ makeDynCall('viii', 'callback')}}}(lua_callback, res_buf, 0);

 	                } else {
@@ -166,4 +166,4 @@ var LibraryFacebookIAP = {
 }

 autoAddDeps(LibraryFacebookIAP, '$FBinner');
-mergeInto(LibraryManager.library, LibraryFacebookIAP);
+addToLibrary(LibraryFacebookIAP);
--- a/extension-iap/manifests/android/build.gradle
+++ b/extension-iap/manifests/android/build.gradle
@@ -1,3 +1,7 @@
-dependencies {
-    implementation 'com.android.billingclient:billing:5.0.0'
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'com.android.billingclient:billing:6.2.1'
 }
--- a/extension-iap/src/iap.h
+++ b/extension-iap/src/iap.h
@@ -31,6 +31,7 @@ enum BillingResponse
    BILLING_RESPONSE_RESULT_ERROR = 6,
    BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7,
    BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8,
+    BILLING_RESPONSE_RESULT_NETWORK_ERROR = 9,
 };

 enum ProviderId
--- a/extension-iap/src/java/com/defold/iap/IapGooglePlay.java
+++ b/extension-iap/src/java/com/defold/iap/IapGooglePlay.java
@@ -221,7 +221,6 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
            case BillingResponseCode.OK:
                defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_OK;
                break;
-            case BillingResponseCode.SERVICE_TIMEOUT:
            case BillingResponseCode.SERVICE_UNAVAILABLE:
            case BillingResponseCode.SERVICE_DISCONNECTED:
                defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE;
@@ -229,6 +228,9 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
            case BillingResponseCode.USER_CANCELED:
                defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_USER_CANCELED;
                break;
+            case BillingResponseCode.NETWORK_ERROR:  // new in Play Billing Library 6.0.0
+                defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_NETWORK_ERROR;
+                break;
            case BillingResponseCode.FEATURE_NOT_SUPPORTED:
            case BillingResponseCode.ERROR:
            default:
@@ -243,6 +245,20 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
        return billingResponseCodeToDefoldResponse(result.getResponseCode());
    }

+    private void invokeOnPurchaseResultListener(IPurchaseListener purchaseListener, int billingResultCode, String purchaseData) {
+        if (purchaseListener == null) {
+            Log.w(TAG, "Received billing result but no listener has been set");
+            return;
+        }
+        purchaseListener.onPurchaseResult(billingResultCode, purchaseData);
+    }
+    private void invokeOnPurchaseResultListener(IPurchaseListener purchaseListener, BillingResult billingResult, Purchase purchase) {
+        invokeOnPurchaseResultListener(purchaseListener, billingResultToDefoldResponse(billingResult), convertPurchase(purchase));
+    }
+    private void invokeOnPurchaseResultListener(IPurchaseListener purchaseListener, BillingResult billingResult) {
+        invokeOnPurchaseResultListener(purchaseListener, billingResultToDefoldResponse(billingResult), "");
+    }
+
    /**
     * This method is called either explicitly from Lua or from extension code
     * when "set_listener()" is called from Lua.
@@ -306,7 +322,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
                // note: we only call the purchase listener if an error happens
                if (billingResult.getResponseCode() != BillingResponseCode.OK) {
                    Log.e(TAG, "Unable to consume purchase: " + billingResult.getDebugMessage());
-                    purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+                    invokeOnPurchaseResultListener(purchaseListener, billingResult);
                }
            }
        });
@@ -329,7 +345,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
                // note: we only call the purchase listener if an error happens
                if (billingResult.getResponseCode() != BillingResponseCode.OK) {
                    Log.e(TAG, "Unable to acknowledge purchase: " + billingResult.getDebugMessage());
-                    purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+                    invokeOnPurchaseResultListener(purchaseListener, billingResult);
                }
            }
        });
@@ -348,12 +364,12 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
                @Override
                public void onConsumeResponse(BillingResult billingResult, String purchaseToken) {
                    Log.d(TAG, "handlePurchase() response code " + billingResult.getResponseCode() + " purchaseToken: " + purchaseToken);
-                    purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), convertPurchase(purchase));
+                    invokeOnPurchaseResultListener(purchaseListener, billingResult, purchase);
                }
            });
        }
        else {
-            purchaseListener.onPurchaseResult(billingResponseCodeToDefoldResponse(BillingResponseCode.OK), convertPurchase(purchase));
+            invokeOnPurchaseResultListener(purchaseListener, billingResponseCodeToDefoldResponse(BillingResponseCode.OK), convertPurchase(purchase));
        }
    }

@@ -362,13 +378,17 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
     */
    @Override
    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) {
+                    if (purchase != null) {
                        handlePurchase(purchase, this.purchaseListener);
                    }
                }
+            }
+        }
        else {
-            this.purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+            invokeOnPurchaseResultListener(this.purchaseListener, billingResult);
        }
    }

@@ -392,7 +412,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
        BillingResult billingResult = billingClient.launchBillingFlow(this.activity, billingFlowParams);
        if (billingResult.getResponseCode() != BillingResponseCode.OK) {
            Log.e(TAG, "Purchase failed: " + billingResult.getDebugMessage());
-            purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+            invokeOnPurchaseResultListener(purchaseListener, billingResult);
        }
    }

@@ -413,11 +433,16 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
                @Override
                public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetailsList) {
                    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 {
                        Log.e(TAG, "Unable to get product details before buying: " + billingResult.getDebugMessage());
-                        purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+                        invokeOnPurchaseResultListener(purchaseListener, billingResult);
                    }
                }
            });
@@ -435,11 +460,13 @@ public class IapGooglePlay implements PurchasesUpdatedListener {

            @Override
            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)
                    for (ProductDetails pd : productDetails) {
+                        if (pd != null) {
                            IapGooglePlay.this.products.put(pd.getProductId(), pd);
                        }
+                    }
                    // add to list of all product details
                    allProductDetails.addAll(productDetails);
                }
@@ -485,11 +512,13 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
            @Override
            public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetails) {
                JSONArray a = new JSONArray();
-                if (billingResult.getResponseCode() == BillingResponseCode.OK) {
+                if ((billingResult.getResponseCode() == BillingResponseCode.OK) && (productDetails != null) && !productDetails.isEmpty()) {
                    for (ProductDetails pd : productDetails) {
+                        if (pd != null) {
                            a.put(convertProductDetails(pd));
                        }
                    }
+                }
                else {
                    Log.e(TAG, "Unable to list products: " + billingResult.getDebugMessage());
                }
--- a/extension-iap/src/java/com/defold/iap/IapJNI.java
+++ b/extension-iap/src/java/com/defold/iap/IapJNI.java
@@ -18,6 +18,7 @@ public class IapJNI implements IListProductsListener, IPurchaseListener {
    public static final int BILLING_RESPONSE_RESULT_ERROR = 6;
    public static final int BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7;
    public static final int BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8;
+    public static final int BILLING_RESPONSE_RESULT_NETWORK_ERROR = 9;

    public IapJNI() {
    }
--- a/game.project
+++ b/game.project
@@ -12,11 +12,10 @@ height = 1136
 input_method = HiddenInputField
 package = com.defold.extension.iap
 version_code = 7
-target_sdk_version = 29

 [project]
 title = extension-iap
-dependencies = https://github.com/andsve/dirtylarry/archive/master.zip
+dependencies#0 = https://github.com/andsve/dirtylarry/archive/master.zip

 [library]
 include_dirs = extension-iap
--- a/main/main.gui
+++ b/main/main.gui
@@ -1,7 +1,7 @@
 script: "/main/main.gui_script"
 fonts {
-  name: "system_font"
-  font: "/builtins/fonts/system_font.font"
+  name: "default"
+  font: "/builtins/fonts/default.font"
 }
 background_color {
  x: 0.0
@@ -47,6 +47,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/button.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -102,6 +104,10 @@ nodes {
  alpha: 1.0
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -166,6 +172,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -205,6 +215,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/button.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -261,6 +273,10 @@ nodes {
  overridden_fields: 4
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -325,6 +341,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -360,7 +380,7 @@ nodes {
  type: TYPE_TEXT
  blend_mode: BLEND_MODE_ALPHA
  text: "<text>"
-  font: "system_font"
+  font: "default"
  id: "log"
  xanchor: XANCHOR_NONE
  yanchor: YANCHOR_NONE
@@ -387,6 +407,10 @@ nodes {
  template_node_child: false
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -426,6 +450,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/button.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -481,6 +507,10 @@ nodes {
  alpha: 1.0
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -545,6 +575,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -584,6 +618,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/button.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -639,6 +675,10 @@ nodes {
  alpha: 1.0
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -703,6 +743,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -742,6 +786,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/button.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -798,6 +844,10 @@ nodes {
  overridden_fields: 4
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -862,6 +912,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -901,6 +955,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/button.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -956,6 +1012,10 @@ nodes {
  alpha: 1.0
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -1020,6 +1080,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -1059,6 +1123,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/button.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -1115,6 +1181,10 @@ nodes {
  overridden_fields: 4
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -1179,6 +1249,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -1218,6 +1292,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/checkbox_label.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -1273,6 +1349,10 @@ nodes {
  alpha: 1.0
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -1337,6 +1417,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -1376,6 +1460,8 @@ nodes {
  alpha: 1.0
  template: "/dirtylarry/checkbox_label.gui"
  template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
  position {
@@ -1431,6 +1517,10 @@ nodes {
  alpha: 1.0
  template_node_child: true
  size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
  position {
@@ -1495,6 +1585,10 @@ nodes {
  template_node_child: true
  text_leading: 1.0
  text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 material: "/builtins/materials/gui.material"
 adjust_reference: ADJUST_REFERENCE_PARENT
--- a/main/main.gui_script
+++ b/main/main.gui_script
@@ -44,7 +44,13 @@ end

 local function buy(id)
 	log("iap.buy() " .. id)
-	iap.buy(id)
+	local options = {}
+	local item = available_items[id]
+	if item.subscriptions then
+		local subscription = item.subscriptions[1]
+		options.token = subscription.token
+	end
+	iap.buy(id, options)
 end

 local function restore()
Author	SHA1	Message	Date
Björn Ritzl	f398677d7b	Merge pull request #68 from defold/dev-update-to-android-billing-6-0-1 Update to android billing 6.2.1	2024-07-04 15:18:13 +02:00
Björn Ritzl	d1c4e88562	Update build.gradle	2024-07-04 15:04:32 +02:00
Björn Ritzl	6f06d7f08f	Updated to 6.0.1	2024-07-04 14:52:58 +02:00
Björn Ritzl	0852e42977	Update .gitignore	2024-07-04 14:36:12 +02:00
Björn Ritzl	ba0e1b645a	Merge pull request #65 from defold/dev-update-to-android-billing-6-0-0 Updated to Play Billing 6.0.0	2024-07-03 19:26:34 +02:00
Björn Ritzl	801179288e	Include the offer token when buying	2024-07-03 19:25:36 +02:00
Björn Ritzl	195ef400b5	Play Billing 6.0.0	2024-07-02 22:33:09 +02:00
Alexey Gulev	68ef7f4615	Merge pull request #63 from ekharkunov/emscripten-update Update js code according to new Emscripten version (3.1.55).	2024-04-10 11:08:22 +02:00
Kharkunov Eugene	1a34582603	Update js code according to new Emscripten version (3.1.55). Update assets to latest Defold version. Remove armv7-ios from manifest as unsupported platform.	2024-04-10 11:27:41 +03:00
Björn Ritzl	09f5060d44	Update index.md	2023-10-03 14:40:19 +02:00
Björn Ritzl	649a8a1ebf	Merge pull request #58 from defold/Issue-47-index-out-of-bounds-exception Added product and purchase null checks	2023-02-07 15:53:39 +01:00
Björn Ritzl	5c09447e37	Merge pull request #59 from defold/Issue-56-app-crash-on-slow-purchase Check that the purchase listener is not null	2023-02-07 15:51:25 +01:00
Björn Ritzl	ad06de7b9c	Check purchase listener	2023-02-06 23:11:24 +01:00
Björn Ritzl	d74c97d5c7	Added null checks	2023-02-06 15:56:03 +01:00