From b7951afd183006929193c8ba61223afa4946930a Mon Sep 17 00:00:00 2001 From: Nikita Zhelonkin Date: Fri, 1 Nov 2019 12:22:19 +0300 Subject: [PATCH 1/8] Added serviceTimeout code for google iab --- .../src/billing_client_wrappers/billing_client_wrapper.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart index 6d7cd83eb0ad..476f2c50dab8 100644 --- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart +++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart @@ -248,6 +248,9 @@ enum BillingResponse { // WARNING: Changes to this class need to be reflected in our generated code. // Run `flutter packages pub run build_runner watch` to rebuild and watch for // further changes. + @JsonValue(-3) + serviceTimeout, + @JsonValue(-2) featureNotSupported, From 003cc64bf6d8cb6fe5d10d03b18a412f0c1c5150 Mon Sep 17 00:00:00 2001 From: Nikita Zhelonkin Date: Mon, 11 Nov 2019 10:16:16 +0300 Subject: [PATCH 2/8] Generate enum value --- .../lib/src/billing_client_wrappers/enum_converters.g.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart index ec8d57ba60e1..f2b6bf01c070 100644 --- a/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart +++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart @@ -32,6 +32,7 @@ T _$enumDecode(Map enumValues, dynamic source) { } const _$BillingResponseEnumMap = { + BillingResponse.serviceTimeout: -3, BillingResponse.featureNotSupported: -2, BillingResponse.serviceDisconnected: -1, BillingResponse.ok: 0, From 5638191b53aee6e7cc51be7cc6d79f169569f90d Mon Sep 17 00:00:00 2001 From: vlad Date: Sat, 5 Sep 2020 00:34:38 +0300 Subject: [PATCH 3/8] in_app_purchase BillingResponseEnum test --- .../enum_converters_test.dart | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 packages/in_app_purchase/test/billing_client_wrappers/enum_converters_test.dart diff --git a/packages/in_app_purchase/test/billing_client_wrappers/enum_converters_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/enum_converters_test.dart new file mode 100644 index 000000000000..767abf33b493 --- /dev/null +++ b/packages/in_app_purchase/test/billing_client_wrappers/enum_converters_test.dart @@ -0,0 +1,95 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +import 'package:test/test.dart'; +import 'package:in_app_purchase/billing_client_wrappers.dart'; +import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart'; + +void main() { + group('BillingResponse', () { + test('serviceTimeout', () { + final BillingResponse parsed = BillingResponse.serviceTimeout; + final BillingResponse expected = BillingResponseConverter().fromJson(-3); + + expect(parsed, equals(expected)); + }); + + test('featureNotSupported', () { + final BillingResponse parsed = BillingResponse.featureNotSupported; + final BillingResponse expected = BillingResponseConverter().fromJson(-2); + + expect(parsed, equals(expected)); + }); + + test('serviceDisconnected', () { + final BillingResponse parsed = BillingResponse.serviceDisconnected; + final BillingResponse expected = BillingResponseConverter().fromJson(-1); + + expect(parsed, equals(expected)); + }); + + test('ok', () { + final BillingResponse parsed = BillingResponse.ok; + final BillingResponse expected = BillingResponseConverter().fromJson(0); + + expect(parsed, equals(expected)); + }); + + test('userCanceled', () { + final BillingResponse parsed = BillingResponse.userCanceled; + final BillingResponse expected = BillingResponseConverter().fromJson(1); + + expect(parsed, equals(expected)); + }); + + test('serviceUnavailable', () { + final BillingResponse parsed = BillingResponse.serviceUnavailable; + final BillingResponse expected = BillingResponseConverter().fromJson(2); + + expect(parsed, equals(expected)); + }); + + test('billingUnavailable', () { + final BillingResponse parsed = BillingResponse.billingUnavailable; + final BillingResponse expected = BillingResponseConverter().fromJson(3); + + expect(parsed, equals(expected)); + }); + + test('itemUnavailable', () { + final BillingResponse parsed = BillingResponse.itemUnavailable; + final BillingResponse expected = BillingResponseConverter().fromJson(4); + + expect(parsed, equals(expected)); + }); + + test('developerError', () { + final BillingResponse parsed = BillingResponse.developerError; + final BillingResponse expected = BillingResponseConverter().fromJson(5); + + expect(parsed, equals(expected)); + }); + + test('error', () { + final BillingResponse parsed = BillingResponse.error; + final BillingResponse expected = BillingResponseConverter().fromJson(6); + + expect(parsed, equals(expected)); + }); + + test('itemAlreadyOwned', () { + final BillingResponse parsed = BillingResponse.itemAlreadyOwned; + final BillingResponse expected = BillingResponseConverter().fromJson(7); + + expect(parsed, equals(expected)); + }); + + test('itemNotOwned', () { + final BillingResponse parsed = BillingResponse.itemNotOwned; + final BillingResponse expected = BillingResponseConverter().fromJson(8); + + expect(parsed, equals(expected)); + }); + }); +} \ No newline at end of file From 61e66f0b5a49bd3bbe742654aff0d55a85433a06 Mon Sep 17 00:00:00 2001 From: vlad Date: Sat, 5 Sep 2020 01:19:01 +0300 Subject: [PATCH 4/8] in_app_purchase BillingResponseEnum test --- packages/in_app_purchase/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md index 9c454a8ee71c..1b4534cececa 100644 --- a/packages/in_app_purchase/CHANGELOG.md +++ b/packages/in_app_purchase/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.1+3 + +* Android: Fixed bug due to code -3 (SERVICE_TIMEOUT) in `BillingResponse` + ## 0.3.1+2 * Fix potential casting crash on Android v1 embedding when registering life cycle callbacks. From 8c6490d4cc92e60c335ab98d380a1b56a29e7497 Mon Sep 17 00:00:00 2001 From: vlad Date: Sat, 5 Sep 2020 01:20:23 +0300 Subject: [PATCH 5/8] in_app_purchase BillingResponseEnum test --- packages/in_app_purchase/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md index 1b4534cececa..2aff2cc8b4c9 100644 --- a/packages/in_app_purchase/CHANGELOG.md +++ b/packages/in_app_purchase/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.3.1+3 +## 0.3.4+6 * Android: Fixed bug due to code -3 (SERVICE_TIMEOUT) in `BillingResponse` From 489c30412c55724ac29532b903d413ab977e7e87 Mon Sep 17 00:00:00 2001 From: vlad Date: Sat, 5 Sep 2020 01:27:02 +0300 Subject: [PATCH 6/8] in_app_purchase BillingResponseEnum test --- packages/in_app_purchase/CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md index 2aff2cc8b4c9..9c454a8ee71c 100644 --- a/packages/in_app_purchase/CHANGELOG.md +++ b/packages/in_app_purchase/CHANGELOG.md @@ -1,7 +1,3 @@ -## 0.3.4+6 - -* Android: Fixed bug due to code -3 (SERVICE_TIMEOUT) in `BillingResponse` - ## 0.3.1+2 * Fix potential casting crash on Android v1 embedding when registering life cycle callbacks. From 3b8ca9a02d2c7849ef243caf52251db252ab9f04 Mon Sep 17 00:00:00 2001 From: vlad Date: Sat, 5 Sep 2020 01:32:32 +0300 Subject: [PATCH 7/8] in_app_purchase BillingResponseEnum test --- .../test/billing_client_wrappers/enum_converters_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/in_app_purchase/test/billing_client_wrappers/enum_converters_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/enum_converters_test.dart index 767abf33b493..afa253fe768c 100644 --- a/packages/in_app_purchase/test/billing_client_wrappers/enum_converters_test.dart +++ b/packages/in_app_purchase/test/billing_client_wrappers/enum_converters_test.dart @@ -92,4 +92,4 @@ void main() { expect(parsed, equals(expected)); }); }); -} \ No newline at end of file +} From 337615268c0cbee8d75679c15fe6a7c23b947081 Mon Sep 17 00:00:00 2001 From: vlad Date: Sat, 5 Sep 2020 01:36:36 +0300 Subject: [PATCH 8/8] in_app_purchase BillingResponseEnum test --- packages/in_app_purchase/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md index 65f7f86a16e6..49e5845581af 100644 --- a/packages/in_app_purchase/CHANGELOG.md +++ b/packages/in_app_purchase/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.4+6 + +* Android: Fixed bug due to code -3 (SERVICE_TIMEOUT) in `BillingResponse` + ## 0.3.4+5 * Added necessary README docs for getting started with Android.