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

Update to android billing 6.2.1

.gitignore

@@ -9,3 +9,5 @@ Thumbs.db
 .cproject
 builtins
 _site
+manifest.private.der
+manifest.public.der

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

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']

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);

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'
 }

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

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:

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() {
     }

game.project

@@ -12,7 +12,6 @@ height = 1136
 input_method = HiddenInputField
 package = com.defold.extension.iap
 version_code = 7
-target_sdk_version = 29
 
 [project]
 title = extension-iap

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

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()