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

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