Code refactor & more proper null safety update #301

bohdan1krokhmaliuk · 2021-07-22T17:18:16Z

General refactor of android part, small refactor of ios part
updated logic for some methods and fixed AndroidStudio warnings
replaced JSONObject with HashMap(supported by MethodChannels) in androidInAppPurchasePlugin.java
deprecated originalJsonAndroid and dataAndroid as it is always the same object as transactionReceipt
refactored Dart part

bohdan1krokhmaliuk · 2021-07-22T17:18:55Z

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.5.0


PR: NOT FINISHED YET

1. Updated Amazon file to return acceptable value types by plugin 2. Created FlutterEntitiesBuilder 3. Removed unnecessary try catches

bohdan1krokhmaliuk · 2021-07-23T09:27:46Z

android/src/main/java/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.java

@@ -4,32 +4,28 @@
 import android.content.Context;


@hyochan What is the status on amazon IAP? Is it a working feature? I tried to unify Amazon IAPs maps to be the same as Android apps, but it is better to kill amazon IAPs in case it is not a working feature and nobody uses it.

@bohdan1krokhmaliuk Honestly I've not tried Amazon at all because I am not using it. Also, this was developed by the community by @Rockvole.

How about separating the two variants as done in dooboolab-community/react-native-iap#1336?

No no, I was wondering cause it would make two more variables not nullable

Hi, Sorry I cant help much, I have not done any Android java development since this Amazon IAP work (2018 I think). The Amazon store may become more important soon since it will be used for Android apps in Windows 11.
https://www.theverge.com/2021/6/24/22548428/microsoft-windows-11-android-apps-support-amazon-store

bohdan1krokhmaliuk · 2021-07-23T09:29:55Z

lib/modules.dart

        /// android specific
-        'dataAndroid: $dataAndroid, '
        'signatureAndroid: $signatureAndroid, '
        'isAcknowledgedAndroid: $isAcknowledgedAndroid, '
        'autoRenewingAndroid: $autoRenewingAndroid, '
        'purchaseStateAndroid: $purchaseStateAndroid, '
-        'originalJsonAndroid: $originalJsonAndroid, '



not needed fields removed as those are the copy of transactionReceipt

Sure you can remove it!

bohdan1krokhmaliuk · 2021-07-24T18:45:27Z

ios/Classes/FlutterInappPurchasePlugin.m

-    NSString* introductoryPriceNumber = @"";
-    NSString* introductoryPricePaymentMode = @"";
-    NSString* introductoryPriceNumberOfPeriods = @"";
-    NSString* introductoryPriceSubscriptionPeriod = @"";
+    NSString* introductoryPriceNumber;
+    NSString* introductoryPricePaymentMode;
+    NSString* introductoryPriceNumberOfPeriods;
+    NSString* introductoryPriceSubscriptionPeriod;


There should be no default values

bohdan1krokhmaliuk · 2021-07-24T18:45:59Z

ios/Classes/FlutterInappPurchasePlugin.m

-                                             @(transaction.transactionDate.timeIntervalSince1970 * 1000), @"transactionDate",
+                                             @(lround(transaction.transactionDate.timeIntervalSince1970 * 1000)), @"transactionDate",


int on dart side

bohdan1krokhmaliuk · 2021-07-24T18:47:57Z

lib/flutter_inapp_purchase.dart

-    } else if (_platform.isIOS) {
-      return 'no-ops in ios';
    }
-    throw PlatformException(
-        code: _platform.operatingSystem, message: "platform not supported");


Platform specific methods should throw exceptions on not supported platforms

bohdan1krokhmaliuk · 2021-07-24T18:48:23Z

lib/flutter_inapp_purchase.dart

-  Future get consumeAllItems async {
+  Future get consumeAllItemsAndroid async {
    if (_platform.isAndroid) {


Platform specific methods should end with platform name

bohdan1krokhmaliuk · 2021-07-24T18:50:18Z

lib/flutter_inapp_purchase.dart

      );
-
-      return extractItems(json.encode(result));
+      return extractItems(result ?? []);


Around the whole platform operations with strings were replaced with operations with maps. So method channels are sending maps mostly and there is no need to make another unnecessary json string encode/decode

bohdan1krokhmaliuk · 2021-07-24T19:14:10Z

@hyochan Could you please test if there are no type errors with subscriptions and consumables IAPs for android and IOS? As I use just non-consumables and it works fine with them?

hyochan · 2021-07-27T05:35:27Z

@hyochan Could you please test if there are no type errors with subscriptions and consumables IAPs for android and IOS? As I use just non-consumables and it works fine with them?

Hm. Looks like we need others to test this out because I don't have any related example currently 😞
All we have is an example project in current repo.

github-actions · 2021-10-26T01:02:34Z

This PR is stale because it has been open 90 days with no activity. Leave a comment or this will be closed in 7 days

Android part

34807fb

bohdan1krokhmaliuk marked this pull request as draft July 22, 2021 17:18

bohdan1krokhmaliuk commented Jul 22, 2021

View reviewed changes

CHANGELOG.md

@@ -1,3 +1,6 @@

## 5.5.0

Copy link

Contributor Author

bohdan1krokhmaliuk Jul 22, 2021 •

edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR: NOT FINISHED YET

hyochan reacted with eyes emoji

Bohdan Krokhmaliuk added 2 commits July 22, 2021 20:22

up

e88f5a9

UP:

981e214

1. Updated Amazon file to return acceptable value types by plugin 2. Created FlutterEntitiesBuilder 3. Removed unnecessary try catches

hyochan added the refactor label Jul 23, 2021

Bohdan Krokhmaliuk added 2 commits July 23, 2021 11:38

Android refactor finsihed

df443f8

up

528615c

bohdan1krokhmaliuk commented Jul 23, 2021

View reviewed changes

Bohdan Krokhmaliuk added 2 commits July 24, 2021 19:42

Refacrtor IOS part

418b64c

Types update

7df8512

bohdan1krokhmaliuk commented Jul 24, 2021

View reviewed changes

Tests fix

e522bd3

up

113aa1e

bohdan1krokhmaliuk marked this pull request as ready for review July 26, 2021 07:28

bohdan1krokhmaliuk mentioned this pull request Jul 28, 2021

[IOS] Transaction receipt became encoded #297

Closed

dmiedev mentioned this pull request Aug 30, 2021

checkSubscribed() - _CastError (type 'Future<List<PurchasedItem>?>' is not a subtype of type 'FutureOr<List<PurchasedItem>>' in type cast) #308

Closed

github-actions bot added the no-pr-activity label Oct 26, 2021

github-actions bot closed this Nov 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Code refactor & more proper null safety update #301

Code refactor & more proper null safety update #301

bohdan1krokhmaliuk commented Jul 22, 2021 •

edited

bohdan1krokhmaliuk Jul 22, 2021 •

edited

bohdan1krokhmaliuk Jul 23, 2021

hyochan Jul 24, 2021

bohdan1krokhmaliuk Jul 24, 2021

Rockvole Jul 27, 2021

bohdan1krokhmaliuk Jul 23, 2021

hyochan Jul 24, 2021

bohdan1krokhmaliuk Jul 24, 2021

bohdan1krokhmaliuk Jul 24, 2021

bohdan1krokhmaliuk Jul 24, 2021

bohdan1krokhmaliuk Jul 24, 2021

bohdan1krokhmaliuk Jul 24, 2021

bohdan1krokhmaliuk commented Jul 24, 2021

hyochan commented Jul 27, 2021

github-actions bot commented Oct 26, 2021

		@(transaction.transactionDate.timeIntervalSince1970 * 1000), @"transactionDate",
		@(lround(transaction.transactionDate.timeIntervalSince1970 * 1000)), @"transactionDate",

Code refactor & more proper null safety update #301

Code refactor & more proper null safety update #301

Conversation

bohdan1krokhmaliuk commented Jul 22, 2021 • edited

bohdan1krokhmaliuk Jul 22, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bohdan1krokhmaliuk commented Jul 24, 2021

hyochan commented Jul 27, 2021

github-actions bot commented Oct 26, 2021

bohdan1krokhmaliuk commented Jul 22, 2021 •

edited

bohdan1krokhmaliuk Jul 22, 2021 •

edited