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

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

Browse Source 
Updated to Play Billing 6.0.0
This commit is contained in:
Björn Ritzl 2024-07-03 19:26:34 +02:00 committed by GitHub
commit ba0e1b645a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extension-iap/manifests/android/build.gradle
View File

@ -1,3 +1,7 @@
dependencies { repositories {
implementation 'com.android.billingclient:billing:5.0.0' mavenCentral()
}
dependencies {
implementation 'com.android.billingclient:billing:6.0.0'
} }

1
extension-iap/src/iap.h
View File

@ -31,6 +31,7 @@ enum BillingResponse
BILLING_RESPONSE_RESULT_ERROR = 6, BILLING_RESPONSE_RESULT_ERROR = 6,
BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7, BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7,
BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8, BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8,
BILLING_RESPONSE_RESULT_NETWORK_ERROR = 9,
}; };
enum ProviderId enum ProviderId

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

@ -221,7 +221,6 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
case BillingResponseCode.OK: case BillingResponseCode.OK:
defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_OK; defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_OK;
break; break;
case BillingResponseCode.SERVICE_TIMEOUT:
case BillingResponseCode.SERVICE_UNAVAILABLE: case BillingResponseCode.SERVICE_UNAVAILABLE:
case BillingResponseCode.SERVICE_DISCONNECTED: case BillingResponseCode.SERVICE_DISCONNECTED:
defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE; defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE;
@ -229,6 +228,9 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
case BillingResponseCode.USER_CANCELED: case BillingResponseCode.USER_CANCELED:
defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_USER_CANCELED; defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_USER_CANCELED;
break; 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.FEATURE_NOT_SUPPORTED:
case BillingResponseCode.ERROR: case BillingResponseCode.ERROR:
default: default:

1
extension-iap/src/java/com/defold/iap/IapJNI.java
View File

@ -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_ERROR = 6;
public static final int BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7; 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_ITEM_NOT_OWNED = 8;
public static final int BILLING_RESPONSE_RESULT_NETWORK_ERROR = 9;
public IapJNI() { public IapJNI() {
} }

8
main/main.gui_script
View File

@ -44,7 +44,13 @@ end
local function buy(id) local function buy(id)
log("iap.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 end
local function restore() local function restore()