Code refactor & more proper null safety update #301
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,32 +4,28 @@ | |
| import android.content.Context; | ||
|
There was a problem hiding this comment. @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. There was a problem hiding this comment. @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? There was a problem hiding this comment. No no, I was wondering cause it would make two more variables not nullable There was a problem hiding this comment. 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. |
||
| import android.util.Log; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
|
|
||
| import com.amazon.device.iap.PurchasingListener; | ||
| import com.amazon.device.iap.PurchasingService; | ||
| import com.amazon.device.iap.model.FulfillmentResult; | ||
| import com.amazon.device.iap.model.Product; | ||
| import com.amazon.device.iap.model.ProductDataResponse; | ||
| import com.amazon.device.iap.model.PurchaseResponse; | ||
| import com.amazon.device.iap.model.PurchaseUpdatesResponse; | ||
| import com.amazon.device.iap.model.Receipt; | ||
| import com.amazon.device.iap.model.RequestId; | ||
| import com.amazon.device.iap.model.UserDataResponse; | ||
|
|
||
| import java.text.NumberFormat; | ||
| import java.text.ParseException; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| import io.flutter.plugin.common.MethodCall; | ||
| import io.flutter.plugin.common.MethodChannel; | ||
| import io.flutter.plugin.common.MethodChannel.MethodCallHandler; | ||
|
|
@@ -57,14 +53,14 @@ public void setChannel(MethodChannel channel) { | |
| } | ||
|
|
||
| @Override | ||
| public void onMethodCall(final @NonNull MethodCall call, final @NonNull Result result) { | ||
| this.result=result; | ||
| try { | ||
| PurchasingService.registerListener(context, purchasesUpdatedListener); | ||
| } catch (Exception e) { | ||
| result.error(call.method, "Call endConnection method if you want to start over.", e.getMessage()); | ||
| } | ||
|
|
||
| if (call.method.equals("getPlatformVersion")) { | ||
| try { | ||
| result.success("Android " + android.os.Build.VERSION.RELEASE); | ||
|
|
@@ -78,7 +74,7 @@ public void onMethodCall(final MethodCall call, final Result result) { | |
| result.success("Billing client has ended."); | ||
| } else if (call.method.equals("consumeAllItems")) { | ||
| // consumable is a separate type in amazon | ||
| result.error("E_NO_OP_IN_AMAZON","no-ops in amazon",null); | ||
| } else if (call.method.equals("getItemsByType")) { | ||
| Log.d(TAG, "getItemsByType"); | ||
| String type = call.argument("type"); | ||
|
|
@@ -91,34 +87,43 @@ public void onMethodCall(final MethodCall call, final Result result) { | |
| } | ||
| PurchasingService.getProductData(productSkus); | ||
|
|
||
| final ArrayList<HashMap<String, Object>> list = new ArrayList<>(); | ||
| result.success(list); | ||
| } else if (call.method.equals("getAvailableItemsByType")) { | ||
| String type = call.argument("type"); | ||
| Log.d(TAG, "gaibt="+type); | ||
|
|
||
| final ArrayList<HashMap<String, Object>> list = new ArrayList<>(); | ||
| // NOTE: getPurchaseUpdates doesnt return Consumables which are FULFILLED | ||
| if(type.equals("inapp")) { | ||
| PurchasingService.getPurchaseUpdates(true); | ||
| result.success(list); | ||
| } else if(type.equals("subs")) { | ||
| // Subscriptions are retrieved during inapp, so we just return empty list | ||
| result.success(list); | ||
| } else { | ||
| result.notImplemented(); | ||
| } | ||
| } else if (call.method.equals("getPurchaseHistoryByType")) { | ||
| final ArrayList<HashMap<String, Object>> list = new ArrayList<>(); | ||
| // No equivalent | ||
| result.success(list); | ||
| } else if (call.method.equals("buyItemByType")) { | ||
| final String type = call.argument("type"); | ||
| final String obfuscatedAccountId = call.argument("obfuscatedAccountId"); | ||
| final String obfuscatedProfileId = call.argument("obfuscatedProfileId"); | ||
| final String sku = call.argument("sku"); | ||
| final String oldSku = call.argument("oldSku"); | ||
| final int prorationMode = call.argument("prorationMode"); | ||
|
|
||
| Log.d(TAG, "type="+type+"||sku="+sku+"||oldsku="+oldSku); | ||
| final RequestId requestId = PurchasingService.purchase(sku); | ||
| Log.d(TAG, "resid="+requestId.toString()); | ||
|
|
||
| result.success(null); | ||
| } else if (call.method.equals("consumeProduct")) { | ||
| // consumable is a separate type in amazon | ||
| result.error("E_NO_OP_IN_AMAZON","no-ops in amazon",null); | ||
| } else { | ||
| result.notImplemented(); | ||
| } | ||
|
|
@@ -147,49 +152,27 @@ public void onProductDataResponse(ProductDataResponse response) { | |
| final Set<String> unavailableSkus = response.getUnavailableSkus(); | ||
| Log.d(TAG, "onProductDataResponse: " + unavailableSkus.size() + " unavailable skus"); | ||
| Log.d(TAG, "unavailableSkus="+unavailableSkus.toString()); | ||
| ArrayList<HashMap<String,Object>> items = new ArrayList<>(); | ||
|
|
||
| for (Map.Entry<String, Product> skuDetails : productData.entrySet()) { | ||
| Product product=skuDetails.getValue(); | ||
| NumberFormat format = NumberFormat.getCurrencyInstance(); | ||
|
|
||
| Number number; | ||
| try { | ||
| number = format.parse(product.getPrice()); | ||
| } catch (ParseException e) { | ||
| result.error(TAG, "Price Parsing error", e.getMessage()); | ||
| return; | ||
| } | ||
|
|
||
| final HashMap<String,Object> item = FlutterEntitiesBuilder.buildSkuDetailsMap(product); | ||
| Log.d(TAG, "opdr Putting "+item.toString()); | ||
| items.add(item); | ||
| } | ||
| //System.err.println("Sending "+items.toString()); | ||
| result.success(items); | ||
|
|
||
| break; | ||
| case FAILED: | ||
| result.error(TAG,"FAILED",null); | ||
|
|
@@ -209,19 +192,12 @@ public void onPurchaseResponse(PurchaseResponse response) { | |
| case SUCCESSFUL: | ||
| Receipt receipt = response.getReceipt(); | ||
| PurchasingService.notifyFulfillment(receipt.getReceiptId(), FulfillmentResult.FULFILLED); | ||
|
|
||
| final HashMap<String,Object> item = FlutterEntitiesBuilder.buildPurchaseMap(receipt); | ||
| Log.d(TAG, "opr Putting "+item.toString()); | ||
| result.success(item); | ||
| channel.invokeMethod("purchase-updated", item); | ||
|
|
||
| break; | ||
| case FAILED: | ||
| result.error(TAG, "buyItemByType", "billingResponse is not ok: " + status); | ||
|
|
@@ -237,24 +213,16 @@ public void onPurchaseUpdatesResponse(PurchaseUpdatesResponse response) { | |
|
|
||
| switch(status) { | ||
| case SUCCESSFUL: | ||
| ArrayList<HashMap<String,Object>> items = new ArrayList<>(); | ||
|
|
||
| List<Receipt> receipts = response.getReceipts(); | ||
| for(Receipt receipt : receipts) { | ||
| final HashMap<String,Object> item = FlutterEntitiesBuilder.buildPurchaseMap(receipt); | ||
| Log.d(TAG, "opudr Putting "+item.toString()); | ||
| items.add(item); | ||
| } | ||
| result.success(items); | ||
|
|
||
| break; | ||
| case FAILED: | ||
| result.error(TAG,"FAILED",null); | ||
|
|
@@ -267,16 +235,4 @@ public void onPurchaseUpdatesResponse(PurchaseUpdatesResponse response) { | |
| } | ||
| }; | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PR: NOT FINISHED YET