From 458ebe5634c5aa5da0f7417eec5d07b055d7f6ee Mon Sep 17 00:00:00 2001 From: Marian Date: Sat, 21 May 2022 17:43:56 +0200 Subject: [PATCH 01/13] refactor java to kotlin, add showInAppMessageAndroid --- README.md | 1 + android/build.gradle | 21 +- android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + android/gradlew | 185 +++++ android/gradlew.bat | 89 +++ .../AmazonInappPurchasePlugin.java | 276 -------- .../AndroidInappPurchasePlugin.java | 666 ------------------ .../flutterinapppurchase/DoobooUtils.java | 79 --- .../FlutterInappPurchasePlugin.java | 127 ---- .../MethodResultWrapper.java | 63 -- .../AmazonInappPurchasePlugin.kt | 266 +++++++ .../AndroidInappPurchasePlugin.kt | 523 ++++++++++++++ .../flutterinapppurchase/BillingError.kt | 50 ++ .../FlutterInappPurchasePlugin.kt | 116 +++ .../MethodResultWrapper.kt | 30 + example/android/app/build.gradle | 2 +- example/android/build.gradle | 2 +- lib/flutter_inapp_purchase.dart | 35 +- pubspec.yaml | 34 +- 20 files changed, 1313 insertions(+), 1257 deletions(-) create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/gradlew create mode 100644 android/gradlew.bat delete mode 100644 android/src/main/java/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.java delete mode 100644 android/src/main/java/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.java delete mode 100644 android/src/main/java/com/dooboolab/flutterinapppurchase/DoobooUtils.java delete mode 100644 android/src/main/java/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.java delete mode 100644 android/src/main/java/com/dooboolab/flutterinapppurchase/MethodResultWrapper.java create mode 100644 android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt create mode 100644 android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt create mode 100644 android/src/main/kotlin/com/dooboolab/flutterinapppurchase/BillingError.kt create mode 100644 android/src/main/kotlin/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.kt create mode 100644 android/src/main/kotlin/com/dooboolab/flutterinapppurchase/MethodResultWrapper.kt diff --git a/README.md b/README.md index b405092e..8ceba822 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ For help on editing plugin code, view the [documentation](https://flutter.io/dev | validateReceiptIos | `Map` receiptBody, `bool` isTest | `http.Response` | Validate receipt for ios. | | validateReceiptAndroid | `String` packageName, `String` productId, `String` productToken, `String` accessToken, `bool` isSubscription | `http.Response` | Validate receipt for android. | | showPromoCodesIOS | | | Show redeem codes in iOS. | +| showInAppMessageAndroid | | | Google Play will show users messaging during grace period and account hold once per day and provide them an opportunity to fix their payment without leaving the app | ## Purchase flow in `flutter_inapp_purchase@2.0.0+ diff --git a/android/build.gradle b/android/build.gradle index 4301793a..16ffe6cf 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,39 +2,50 @@ group 'com.dooboolab.flutterinapppurchase' version '1.0-SNAPSHOT' buildscript { + ext.kotlin_version = '1.6.21' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:7.0.4' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } rootProject.allprojects { repositories { google() - jcenter() + mavenCentral() } } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { minSdkVersion 21 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } lintOptions { disable 'InvalidPackage' } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { - implementation 'com.android.billingclient:billing:4.0.0' + implementation 'com.android.billingclient:billing-ktx:4.1.0' implementation files('jars/in-app-purchasing-2.0.76.jar') + implementation 'androidx.annotation:annotation:1.3.0' } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..69a97150 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 00000000..744e882e --- /dev/null +++ b/android/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/src/main/java/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.java b/android/src/main/java/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.java deleted file mode 100644 index 68299902..00000000 --- a/android/src/main/java/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.java +++ /dev/null @@ -1,276 +0,0 @@ -package com.dooboolab.flutterinapppurchase; - -import android.app.Activity; -import android.content.Context; -import android.util.Log; - -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.ProductType; -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 org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.text.NumberFormat; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import io.flutter.plugin.common.BinaryMessenger; -import io.flutter.plugin.common.MethodCall; -import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.MethodChannel.MethodCallHandler; -import io.flutter.plugin.common.MethodChannel.Result; - -/** AmazonInappPurchasePlugin */ -public class AmazonInappPurchasePlugin implements MethodCallHandler { - - private final String TAG = "InappPurchasePlugin"; - private MethodResultWrapper safeResult = null; - private MethodChannel channel; - private Context context; - private Activity activity; - - public void setContext(Context context) { - this.context = context; - } - - public void setActivity(Activity activity) { - this.activity = activity; - } - - public void setChannel(MethodChannel channel) { - this.channel = channel; - } - - @Override - public void onMethodCall(final MethodCall call, final Result result) { - safeResult = new MethodResultWrapper(result, channel); - - try { - PurchasingService.registerListener(context, purchasesUpdatedListener); - - } catch (Exception e) { - safeResult.error(call.method, "Call endConnection method if you want to start over.", e.getMessage()); - } - if (call.method.equals("getPlatformVersion")) { - try { - safeResult.success("Android " + android.os.Build.VERSION.RELEASE); - } catch(IllegalStateException e){ - e.printStackTrace(); - } - } else if (call.method.equals("initConnection")) { - PurchasingService.getUserData(); - safeResult.success("Billing client ready"); - } else if (call.method.equals("endConnection")) { - safeResult.success("Billing client has ended."); - } else if (call.method.equals("consumeAllItems")) { - // consumable is a separate type in amazon - safeResult.success("no-ops in amazon"); - } else if (call.method.equals("getItemsByType")) { - Log.d(TAG, "getItemsByType"); - String type = call.argument("type"); - ArrayList skus = call.argument("skus"); - - final Set productSkus = new HashSet<>(); - for (int i = 0; i < skus.size(); i++) { - Log.d(TAG, "Adding "+skus.get(i)); - productSkus.add(skus.get(i)); - } - PurchasingService.getProductData(productSkus); - - } else if (call.method.equals("getAvailableItemsByType")) { - String type = call.argument("type"); - Log.d(TAG, "gaibt="+type); - // NOTE: getPurchaseUpdates doesnt return Consumables which are FULFILLED - if(type.equals("inapp")) { - PurchasingService.getPurchaseUpdates(true); - } else if(type.equals("subs")) { - // Subscriptions are retrieved during inapp, so we just return empty list - safeResult.success("[]"); - } else { - safeResult.notImplemented(); - } - } else if (call.method.equals("getPurchaseHistoryByType")) { - // No equivalent - safeResult.success("[]"); - } 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()); - } else if (call.method.equals("consumeProduct")) { - // consumable is a separate type in amazon - safeResult.success("no-ops in amazon"); - } else { - safeResult.notImplemented(); - } - } - - private PurchasingListener purchasesUpdatedListener = new PurchasingListener() { - @Override - public void onUserDataResponse(UserDataResponse userDataResponse) { - Log.d(TAG, "oudr="+userDataResponse.toString()); - } - - // getItemsByType - @Override - public void onProductDataResponse(ProductDataResponse response) { - Log.d(TAG, "opdr="+response.toString()); - final ProductDataResponse.RequestStatus status = response.getRequestStatus(); - Log.d(TAG, "onProductDataResponse: RequestStatus (" + status + ")"); - - switch (status) { - case SUCCESSFUL: - Log.d(TAG, "onProductDataResponse: successful. The item data map in this response includes the valid SKUs"); - - final Map productData = response.getProductData(); - //Log.d(TAG, "productData="+productData.toString()); - - final Set unavailableSkus = response.getUnavailableSkus(); - Log.d(TAG, "onProductDataResponse: " + unavailableSkus.size() + " unavailable skus"); - Log.d(TAG, "unavailableSkus="+unavailableSkus.toString()); - JSONArray items = new JSONArray(); - try { - for (Map.Entry skuDetails : productData.entrySet()) { - Product product=skuDetails.getValue(); - NumberFormat format = NumberFormat.getCurrencyInstance(); - - JSONObject item = new JSONObject(); - item.put("productId", product.getSku()); - item.put("price", product.getPrice()); - item.put("currency", null); - ProductType productType = product.getProductType(); - switch (productType) { - case ENTITLED: - case CONSUMABLE: - item.put("type", "inapp"); - break; - case SUBSCRIPTION: - item.put("type", "subs"); - break; - } - item.put("localizedPrice", product.getPrice()); - item.put("title", product.getTitle()); - item.put("description", product.getDescription()); - item.put("introductoryPrice", ""); - item.put("subscriptionPeriodAndroid", ""); - item.put("freeTrialPeriodAndroid", ""); - item.put("introductoryPriceCyclesAndroid", 0); - item.put("introductoryPricePeriodAndroid", ""); - Log.d(TAG, "opdr Putting "+item.toString()); - items.put(item); - } - //System.err.println("Sending "+items.toString()); - safeResult.success(items.toString()); - } catch (JSONException e) { - safeResult.error(TAG, "E_BILLING_RESPONSE_JSON_PARSE_ERROR", e.getMessage()); - } - break; - case FAILED: - safeResult.error(TAG,"FAILED",null); - case NOT_SUPPORTED: - Log.d(TAG, "onProductDataResponse: failed, should retry request"); - safeResult.error(TAG,"NOT_SUPPORTED",null); - break; - } - } - - // buyItemByType - @Override - public void onPurchaseResponse(PurchaseResponse response) { - Log.d(TAG, "opr="+response.toString()); - final PurchaseResponse.RequestStatus status = response.getRequestStatus(); - switch(status) { - case SUCCESSFUL: - Receipt receipt = response.getReceipt(); - PurchasingService.notifyFulfillment(receipt.getReceiptId(), FulfillmentResult.FULFILLED); - Date date = receipt.getPurchaseDate(); - Long transactionDate=date.getTime(); - try { - JSONObject item = getPurchaseData(receipt.getSku(), - receipt.getReceiptId(), - receipt.getReceiptId(), - transactionDate.doubleValue()); - Log.d(TAG, "opr Putting "+item.toString()); - safeResult.success(item.toString()); - safeResult.invokeMethod("purchase-updated", item.toString()); - } catch (JSONException e) { - safeResult.error(TAG, "E_BILLING_RESPONSE_JSON_PARSE_ERROR", e.getMessage()); - } - break; - case FAILED: - safeResult.error(TAG, "buyItemByType", "billingResponse is not ok: " + status); - break; - } - } - - // getAvailableItemsByType - @Override - public void onPurchaseUpdatesResponse(PurchaseUpdatesResponse response) { - Log.d(TAG, "opudr="+response.toString()); - final PurchaseUpdatesResponse.RequestStatus status = response.getRequestStatus(); - - switch(status) { - case SUCCESSFUL: - JSONArray items = new JSONArray(); - try { - List receipts = response.getReceipts(); - for(Receipt receipt : receipts) { - Date date = receipt.getPurchaseDate(); - Long transactionDate=date.getTime(); - JSONObject item = getPurchaseData(receipt.getSku(), - receipt.getReceiptId(), - receipt.getReceiptId(), - transactionDate.doubleValue()); - - Log.d(TAG, "opudr Putting "+item.toString()); - items.put(item); - } - safeResult.success(items.toString()); - } catch (JSONException e) { - safeResult.error(TAG, "E_BILLING_RESPONSE_JSON_PARSE_ERROR", e.getMessage()); - } - break; - case FAILED: - safeResult.error(TAG,"FAILED",null); - break; - case NOT_SUPPORTED: - Log.d(TAG, "onPurchaseUpdatesResponse: failed, should retry request"); - safeResult.error(TAG,"NOT_SUPPORTED",null); - break; - } - } - }; - - JSONObject getPurchaseData(String productId, String transactionId, String transactionReceipt, - Double transactionDate) throws JSONException { - JSONObject item = new JSONObject(); - item.put("productId", productId); - item.put("transactionId", transactionId); - item.put("transactionReceipt", transactionReceipt); - item.put("transactionDate", Double.toString(transactionDate)); - item.put("dataAndroid",null); - item.put("signatureAndroid",null); - item.put("purchaseToken",null); - return item; - } -} diff --git a/android/src/main/java/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.java b/android/src/main/java/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.java deleted file mode 100644 index 69d25cdc..00000000 --- a/android/src/main/java/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.java +++ /dev/null @@ -1,666 +0,0 @@ -package com.dooboolab.flutterinapppurchase; - -import androidx.annotation.Nullable; - -import android.app.Activity; -import android.app.Application; -import android.content.Context; -import android.os.Bundle; -import android.util.Log; - -import com.android.billingclient.api.AccountIdentifiers; -import com.android.billingclient.api.AcknowledgePurchaseParams; -import com.android.billingclient.api.AcknowledgePurchaseResponseListener; -import com.android.billingclient.api.BillingClient; -import com.android.billingclient.api.BillingClientStateListener; -import com.android.billingclient.api.BillingFlowParams; -import com.android.billingclient.api.BillingResult; -import com.android.billingclient.api.ConsumeParams; -import com.android.billingclient.api.ConsumeResponseListener; -import com.android.billingclient.api.Purchase; -import com.android.billingclient.api.PurchaseHistoryRecord; -import com.android.billingclient.api.PurchaseHistoryResponseListener; -import com.android.billingclient.api.PurchasesUpdatedListener; -import com.android.billingclient.api.SkuDetails; -import com.android.billingclient.api.SkuDetailsParams; -import com.android.billingclient.api.SkuDetailsResponseListener; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.List; - -import io.flutter.plugin.common.BinaryMessenger; -import io.flutter.plugin.common.FlutterException; -import io.flutter.plugin.common.MethodCall; -import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.MethodChannel.MethodCallHandler; -import io.flutter.plugin.common.MethodChannel.Result; - -/** - * AndroidInappPurchasePlugin - */ -public class AndroidInappPurchasePlugin implements MethodCallHandler, Application.ActivityLifecycleCallbacks { - static private ArrayList skus; - private final String TAG = "InappPurchasePlugin"; - private MethodResultWrapper safeResult = null; - private MethodResultWrapper safeChannel = null; - private BillingClient billingClient; - private Context context; - private Activity activity; - private MethodChannel channel; - - AndroidInappPurchasePlugin() { - skus = new ArrayList<>(); - } - - public void setContext(Context context) { - this.context = context; - } - - public void setActivity(Activity activity) { - this.activity = activity; - } - - public void setChannel(MethodChannel channel) { - this.channel = channel; - } - - public void onDetachedFromActivity() { - endBillingClientConnection(); - } - - @Override - public void onActivityCreated(Activity activity, Bundle savedInstanceState) { - - } - - @Override - public void onActivityStarted(Activity activity) { - - } - - @Override - public void onActivityResumed(Activity activity) { - - } - - @Override - public void onActivityPaused(Activity activity) { - - } - - @Override - public void onActivityDestroyed(Activity activity) { - if (this.activity == activity && this.context != null) { - ((Application) this.context).unregisterActivityLifecycleCallbacks(this); - endBillingClientConnection(); - } - } - - @Override - public void onActivityStopped(Activity activity) { - - } - - @Override - public void onActivitySaveInstanceState(Activity activity, Bundle outState) { - - } - - @Override - public void onMethodCall(final MethodCall call, final Result result) { - safeResult = new MethodResultWrapper(result, channel); - safeChannel = new MethodResultWrapper(result, channel); - - try { - - if (call.method.equals("getPlatformVersion")) { - try { - safeChannel.success("Android " + android.os.Build.VERSION.RELEASE); - return; - } catch (IllegalStateException e) { - safeChannel.error(call.method, e.getMessage(), e.getLocalizedMessage()); - return; - } - } - - /* - * initConnection - */ - else if (call.method.equals("initConnection")) { - if (billingClient != null) { - safeChannel.success("Already started. Call endConnection method if you want to start over."); - return; - } - - billingClient = BillingClient.newBuilder(context).setListener(purchasesUpdatedListener) - .enablePendingPurchases() - .build(); - billingClient.startConnection(new BillingClientStateListener() { - private boolean alreadyFinished = false; - - @Override - public void onBillingSetupFinished(BillingResult billingResult) { - try { - int responseCode = billingResult.getResponseCode(); - - if (responseCode == BillingClient.BillingResponseCode.OK) { - JSONObject item = new JSONObject(); - item.put("connected", true); - safeChannel.invokeMethod("connection-updated", item.toString()); - if (alreadyFinished) return; - alreadyFinished = true; - safeChannel.success("Billing client ready"); - return; - } else { - JSONObject item = new JSONObject(); - item.put("connected", false); - safeChannel.invokeMethod("connection-updated", item.toString()); - if (alreadyFinished) return; - alreadyFinished = true; - safeChannel.error(call.method, "responseCode: " + responseCode, ""); - return; - } - } catch (JSONException je) { - je.printStackTrace(); - } - - } - - @Override - public void onBillingServiceDisconnected() { - try { - JSONObject item = new JSONObject(); - item.put("connected", false); - safeChannel.invokeMethod("connection-updated", item.toString()); - return; - } catch (JSONException je) { - je.printStackTrace(); - } - } - }); - } - - /* - * endConnection - */ - else if (call.method.equals("endConnection")) { - if (billingClient != null) { - try { - billingClient.endConnection(); - billingClient = null; - safeChannel.success("Billing client has ended."); - return; - } catch (Exception e) { - safeChannel.error(call.method, e.getMessage(), ""); - return; - } - } - } - - /* - * consumeAllItems - */ - else if (call.method.equals("consumeAllItems")) { - try { - final ArrayList array = new ArrayList<>(); - Purchase.PurchasesResult purchasesResult = billingClient.queryPurchases(BillingClient.SkuType.INAPP); - if (purchasesResult == null) { - safeChannel.error(call.method, "refreshItem", "No results for query"); - return; - } - final List purchases = purchasesResult.getPurchasesList(); - if (purchases == null || purchases.size() == 0) { - safeChannel.error(call.method, "refreshItem", "No purchases found"); - return; - } - - for (Purchase purchase : purchases) { - final ConsumeParams consumeParams = ConsumeParams.newBuilder() - .setPurchaseToken(purchase.getPurchaseToken()) - .build(); - - final ConsumeResponseListener listener = new ConsumeResponseListener() { - @Override - public void onConsumeResponse(BillingResult billingResult, String outToken) { - array.add(outToken); - if (purchases.size() == array.size()) { - try { - safeChannel.success(array.toString()); - return; - } catch (FlutterException e) { - Log.e(TAG, e.getMessage()); - } - } - } - }; - billingClient.consumeAsync(consumeParams, listener); - } - } catch (Error err) { - safeChannel.error(call.method, err.getMessage(), ""); - return; - } - } - - /* - * getItemsByType - * arguments: type, skus - */ - else if (call.method.equals("getItemsByType")) { - if (billingClient == null || !billingClient.isReady()) { - safeChannel.error(call.method, "IAP not prepared. Check if Google Play service is available.", ""); - return; - } - - String type = call.argument("type"); - final ArrayList skuArr = call.argument("skus"); - - - ArrayList skuList = new ArrayList<>(); - - for (int i = 0; i < skuArr.size(); i++) { - skuList.add(skuArr.get(i)); - } - - SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder(); - params.setSkusList(skuList).setType(type); - - billingClient.querySkuDetailsAsync(params.build(), new SkuDetailsResponseListener() { - @Override - public void onSkuDetailsResponse(BillingResult billingResult, List skuDetailsList) { - int responseCode = billingResult.getResponseCode(); - if (responseCode != BillingClient.BillingResponseCode.OK) { - String[] errorData = DoobooUtils.getInstance().getBillingResponseData(billingResult.getResponseCode()); - safeChannel.error(call.method, errorData[0], errorData[1]); - return; - } - - for (SkuDetails sku : skuDetailsList) { - if (!skus.contains(sku)) { - skus.add(sku); - } - } - - try { - JSONArray items = new JSONArray(); - for (SkuDetails skuDetails : skuDetailsList) { - JSONObject item = new JSONObject(); - item.put("productId", skuDetails.getSku()); - item.put("price", String.valueOf(skuDetails.getPriceAmountMicros() / 1000000f)); - item.put("currency", skuDetails.getPriceCurrencyCode()); - item.put("type", skuDetails.getType()); - item.put("localizedPrice", skuDetails.getPrice()); - item.put("title", skuDetails.getTitle()); - item.put("description", skuDetails.getDescription()); - item.put("introductoryPrice", skuDetails.getIntroductoryPrice()); - item.put("subscriptionPeriodAndroid", skuDetails.getSubscriptionPeriod()); - item.put("freeTrialPeriodAndroid", skuDetails.getFreeTrialPeriod()); - item.put("introductoryPriceCyclesAndroid", skuDetails.getIntroductoryPriceCycles()); - item.put("introductoryPricePeriodAndroid", skuDetails.getIntroductoryPricePeriod()); - // new - item.put("iconUrl", skuDetails.getIconUrl()); - item.put("originalJson", skuDetails.getOriginalJson()); - item.put("originalPrice", skuDetails.getOriginalPriceAmountMicros() / 1000000f); - items.put(item); - } - safeChannel.success(items.toString()); - return; - } catch (JSONException je) { - je.printStackTrace(); - } catch (FlutterException fe) { - safeChannel.error(call.method, fe.getMessage(), fe.getLocalizedMessage()); - return; - } - } - }); - } - - /* - * getAvailableItemsByType - * arguments: type - */ - else if (call.method.equals("getAvailableItemsByType")) { - if (billingClient == null || !billingClient.isReady()) { - safeChannel.error(call.method, "IAP not prepared. Check if Google Play service is available.", ""); - return; - } - - final String type = call.argument("type"); - final JSONArray items = new JSONArray(); - Purchase.PurchasesResult purchasesResult = billingClient.queryPurchases(type.equals("subs") ? BillingClient.SkuType.SUBS : BillingClient.SkuType.INAPP); - final List purchases = purchasesResult.getPurchasesList(); - - try { - if (purchases != null) { - for (Purchase purchase : purchases) { - JSONObject item = new JSONObject(); - item.put("productId", purchase.getSkus().get(0)); - item.put("transactionId", purchase.getOrderId()); - item.put("transactionDate", purchase.getPurchaseTime()); - item.put("transactionReceipt", purchase.getOriginalJson()); - item.put("purchaseToken", purchase.getPurchaseToken()); - item.put("signatureAndroid", purchase.getSignature()); - item.put("purchaseStateAndroid", purchase.getPurchaseState()); - - if (type.equals(BillingClient.SkuType.INAPP)) { - item.put("isAcknowledgedAndroid", purchase.isAcknowledged()); - } else if (type.equals(BillingClient.SkuType.SUBS)) { - item.put("autoRenewingAndroid", purchase.isAutoRenewing()); - } - items.put(item); - } - safeChannel.success(items.toString()); - return; - } - } catch (JSONException je) { - safeChannel.error(call.method, je.getMessage(), je.getLocalizedMessage()); - return; - } catch (FlutterException fe) { - safeChannel.error(call.method, fe.getMessage(), fe.getLocalizedMessage()); - return; - } - } - - /* - * getPurchaseHistoryByType - * arguments: type - */ - else if (call.method.equals("getPurchaseHistoryByType")) { - final String type = call.argument("type"); - - billingClient.queryPurchaseHistoryAsync(type.equals("subs") ? BillingClient.SkuType.SUBS : BillingClient.SkuType.INAPP, new PurchaseHistoryResponseListener() { - @Override - public void onPurchaseHistoryResponse(BillingResult billingResult, List purchaseHistoryRecordList) { - if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK) { - String[] errorData = DoobooUtils.getInstance().getBillingResponseData(billingResult.getResponseCode()); - safeChannel.error(call.method, errorData[0], errorData[1]); - return; - } - - JSONArray items = new JSONArray(); - - try { - for (PurchaseHistoryRecord purchase : purchaseHistoryRecordList) { - JSONObject item = new JSONObject(); - item.put("productId", purchase.getSkus().get(0)); - item.put("transactionDate", purchase.getPurchaseTime()); - item.put("transactionReceipt", purchase.getOriginalJson()); - item.put("purchaseToken", purchase.getPurchaseToken()); - item.put("dataAndroid", purchase.getOriginalJson()); - item.put("signatureAndroid", purchase.getSignature()); - items.put(item); - } - safeChannel.success(items.toString()); - return; - } catch (JSONException je) { - je.printStackTrace(); - } - } - }); - } - - /* - * buyItemByType - * arguments: type, obfuscatedAccountId, obfuscatedProfileId, sku, oldSku, prorationMode, purchaseToken - */ - else if (call.method.equals("buyItemByType")) { - if (billingClient == null || !billingClient.isReady()) { - safeChannel.error(call.method, "IAP not prepared. Check if Google Play service is available.", ""); - return; - } - - 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"); - final String purchaseToken = call.argument("purchaseToken"); - - BillingFlowParams.Builder builder = BillingFlowParams.newBuilder(); - - SkuDetails selectedSku = null; - for (SkuDetails skuDetail : skus) { - if (skuDetail.getSku().equals(sku)) { - selectedSku = skuDetail; - break; - } - } - - if (selectedSku == null) { - String debugMessage = "The sku was not found. Please fetch setObfuscatedAccountIdproducts first by calling getItems"; - safeChannel.error(TAG, "buyItemByType", debugMessage); - return; - } - builder.setSkuDetails(selectedSku); - - BillingFlowParams.SubscriptionUpdateParams.Builder subscriptionUpdateParamsBuilder = - BillingFlowParams.SubscriptionUpdateParams.newBuilder(); - - if (purchaseToken != null) { - subscriptionUpdateParamsBuilder.setOldSkuPurchaseToken(purchaseToken); - } - - if (obfuscatedAccountId != null) { - builder.setObfuscatedAccountId(obfuscatedAccountId); - } - - if (obfuscatedProfileId != null) { - builder.setObfuscatedProfileId(obfuscatedProfileId); - } - - if (prorationMode != -1) { - if (prorationMode - == BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE) { - subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode( - BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE); - if (!type.equals(BillingClient.SkuType.SUBS)) { - String debugMessage = - "IMMEDIATE_AND_CHARGE_PRORATED_PRICE for proration mode only works in" - + " subscription purchase."; - safeChannel.error(TAG, "buyItemByType", debugMessage); - return; - } - } else if (prorationMode - == BillingFlowParams.ProrationMode.IMMEDIATE_WITHOUT_PRORATION) { - subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode( - BillingFlowParams.ProrationMode.IMMEDIATE_WITHOUT_PRORATION); - } else if (prorationMode == BillingFlowParams.ProrationMode.DEFERRED) { - subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode( - BillingFlowParams.ProrationMode.DEFERRED); - } else if (prorationMode - == BillingFlowParams.ProrationMode.IMMEDIATE_WITH_TIME_PRORATION) { - subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode( - BillingFlowParams.ProrationMode.IMMEDIATE_WITHOUT_PRORATION); - } else if (prorationMode - == BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_FULL_PRICE) { - subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode( - BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_FULL_PRICE); - } else { - subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode( - BillingFlowParams.ProrationMode.UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY); - } - } - - if (purchaseToken != null) { - BillingFlowParams.SubscriptionUpdateParams subscriptionUpdateParams = - subscriptionUpdateParamsBuilder.build(); - - builder.setSubscriptionUpdateParams(subscriptionUpdateParams); - } - - if (activity != null) { - BillingFlowParams flowParams = builder.build(); - BillingResult billingResult = billingClient.launchBillingFlow(activity, flowParams); - } - } - - /* - * acknowledgePurchase (For non-consumable purchases) - * arguments: token - */ - else if (call.method.equals("acknowledgePurchase")) { - final String token = call.argument("token"); - - if (billingClient == null || !billingClient.isReady()) { - safeChannel.error(call.method, "IAP not prepared. Check if Google Play service is available.", ""); - return; - } - - AcknowledgePurchaseParams acknowledgePurchaseParams = - AcknowledgePurchaseParams.newBuilder() - .setPurchaseToken(token) - .build(); - billingClient.acknowledgePurchase(acknowledgePurchaseParams, new AcknowledgePurchaseResponseListener() { - @Override - public void onAcknowledgePurchaseResponse(BillingResult billingResult) { - if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK) { - String[] errorData = DoobooUtils.getInstance().getBillingResponseData(billingResult.getResponseCode()); - safeChannel.error(call.method, errorData[0], errorData[1]); - return; - } - try { - JSONObject item = new JSONObject(); - item.put("responseCode", billingResult.getResponseCode()); - item.put("debugMessage", billingResult.getDebugMessage()); - String[] errorData = DoobooUtils.getInstance().getBillingResponseData(billingResult.getResponseCode()); - item.put("code", errorData[0]); - item.put("message", errorData[1]); - safeChannel.success(item.toString()); - } catch (JSONException je) { - je.printStackTrace(); - } - } - }); - } - - /* - * consumeProduct (For consumable purchases) - * arguments: token - */ - else if (call.method.equals("consumeProduct")) { - if (billingClient == null || !billingClient.isReady()) { - safeChannel.error(call.method, "IAP not prepared. Check if Google Play service is available.", ""); - return; - } - - final String token = call.argument("token"); - - final ConsumeParams params = ConsumeParams.newBuilder() - .setPurchaseToken(token) - .build(); - billingClient.consumeAsync(params, new ConsumeResponseListener() { - @Override - public void onConsumeResponse(BillingResult billingResult, String purchaseToken) { - if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK) { - String[] errorData = DoobooUtils.getInstance().getBillingResponseData(billingResult.getResponseCode()); - safeChannel.error(call.method, errorData[0], errorData[1]); - return; - } - - try { - JSONObject item = new JSONObject(); - item.put("responseCode", billingResult.getResponseCode()); - item.put("debugMessage", billingResult.getDebugMessage()); - String[] errorData = DoobooUtils.getInstance().getBillingResponseData(billingResult.getResponseCode()); - item.put("code", errorData[0]); - item.put("message", errorData[1]); - safeChannel.success(item.toString()); - return; - } catch (JSONException je) { - safeChannel.error(TAG, "E_BILLING_RESPONSE_JSON_PARSE_ERROR", je.getMessage()); - return; - } - } - }); - } - - /* - * else - */ - else { - safeChannel.notImplemented(); - return; - } - } catch (Exception e) { - e.printStackTrace(); - try { - safeResult.error(call.method, "IAP not prepared. Check if Google Play service is available.", ""); - return; - } catch (Exception e2) { - e2.printStackTrace(); - } - } - } - - private PurchasesUpdatedListener purchasesUpdatedListener = new PurchasesUpdatedListener() { - @Override - public void onPurchasesUpdated(BillingResult billingResult, @Nullable List purchases) { - - try { - if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK) { - JSONObject json = new JSONObject(); - json.put("responseCode", billingResult.getResponseCode()); - json.put("debugMessage", billingResult.getDebugMessage()); - String[] errorData = DoobooUtils.getInstance().getBillingResponseData(billingResult.getResponseCode()); - json.put("code", errorData[0]); - json.put("message", errorData[1]); - safeResult.invokeMethod("purchase-error", json.toString()); - return; - } - - if (purchases != null) { - for (Purchase purchase : purchases) { - JSONObject item = new JSONObject(); - item.put("productId", purchase.getSkus().get(0)); - item.put("transactionId", purchase.getOrderId()); - item.put("transactionDate", purchase.getPurchaseTime()); - item.put("transactionReceipt", purchase.getOriginalJson()); - item.put("purchaseToken", purchase.getPurchaseToken()); - item.put("dataAndroid", purchase.getOriginalJson()); - item.put("signatureAndroid", purchase.getSignature()); - item.put("purchaseStateAndroid", purchase.getPurchaseState()); - item.put("autoRenewingAndroid", purchase.isAutoRenewing()); - item.put("isAcknowledgedAndroid", purchase.isAcknowledged()); - item.put("packageNameAndroid", purchase.getPackageName()); - item.put("developerPayloadAndroid", purchase.getDeveloperPayload()); - AccountIdentifiers accountIdentifiers = purchase.getAccountIdentifiers(); - - if (accountIdentifiers != null) { - item.put("obfuscatedAccountIdAndroid", accountIdentifiers.getObfuscatedAccountId()); - item.put("obfuscatedProfileIdAndroid", accountIdentifiers.getObfuscatedProfileId()); - } - - safeResult.invokeMethod("purchase-updated", item.toString()); - return; - } - } else { - JSONObject json = new JSONObject(); - json.put("responseCode", billingResult.getResponseCode()); - json.put("debugMessage", billingResult.getDebugMessage()); - String[] errorData = DoobooUtils.getInstance().getBillingResponseData(billingResult.getResponseCode()); - json.put("code", errorData[0]); - json.put("message", "purchases returns null."); - safeResult.invokeMethod("purchase-error", json.toString()); - return; - } - } catch (JSONException je) { - safeResult.invokeMethod("purchase-error", je.getMessage()); - return; - } - } - }; - - private void endBillingClientConnection() { - if (billingClient != null) { - try { - billingClient.endConnection(); - billingClient = null; - } catch (Exception ignored) { - } - } - } -} diff --git a/android/src/main/java/com/dooboolab/flutterinapppurchase/DoobooUtils.java b/android/src/main/java/com/dooboolab/flutterinapppurchase/DoobooUtils.java deleted file mode 100644 index d6f16749..00000000 --- a/android/src/main/java/com/dooboolab/flutterinapppurchase/DoobooUtils.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.dooboolab.flutterinapppurchase; - -import android.util.Log; - -import com.android.billingclient.api.BillingClient; - -public class DoobooUtils { - private static final String TAG = "DoobooUtils"; - public static final String E_UNKNOWN = "E_UNKNOWN"; - public static final String E_NOT_PREPARED = "E_NOT_PREPARED"; - public static final String E_NOT_ENDED = "E_NOT_ENDED"; - public static final String E_USER_CANCELLED = "E_USER_CANCELLED"; - public static final String E_ITEM_UNAVAILABLE = "E_ITEM_UNAVAILABLE"; - public static final String E_NETWORK_ERROR = "E_NETWORK_ERROR"; - public static final String E_SERVICE_ERROR = "E_SERVICE_ERROR"; - public static final String E_ALREADY_OWNED = "E_ALREADY_OWNED"; - public static final String E_REMOTE_ERROR = "E_REMOTE_ERROR"; - public static final String E_USER_ERROR = "E_USER_ERROR"; - public static final String E_DEVELOPER_ERROR = "E_DEVELOPER_ERROR"; - public static final String E_BILLING_RESPONSE_JSON_PARSE_ERROR = "E_BILLING_RESPONSE_JSON_PARSE_ERROR"; - - private static DoobooUtils instance = new DoobooUtils(); - - public static DoobooUtils getInstance() { - return instance; - } - - public String[] getBillingResponseData(final int responseCode) { - String[] errorData = new String[2]; - switch (responseCode) { - case BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED: - errorData[0] = E_SERVICE_ERROR; - errorData[1] = "This feature is not available on your device."; - break; - case BillingClient.BillingResponseCode.SERVICE_DISCONNECTED: - errorData[0] = E_NETWORK_ERROR; - errorData[1] = "The service is disconnected (check your internet connection.)"; - break; - case BillingClient.BillingResponseCode.OK: - errorData[0] = "OK"; - errorData[1] = ""; - break; - case BillingClient.BillingResponseCode.USER_CANCELED: - errorData[0] = E_USER_CANCELLED; - errorData[1] = "Payment is Cancelled."; - break; - case BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE: - errorData[0] = E_SERVICE_ERROR; - errorData[1] = "The service is unreachable. This may be your internet connection, or the Play Store may be down."; - break; - case BillingClient.BillingResponseCode.BILLING_UNAVAILABLE: - errorData[0] = E_SERVICE_ERROR; - errorData[1] = "Billing is unavailable. This may be a problem with your device, or the Play Store may be down."; - break; - case BillingClient.BillingResponseCode.ITEM_UNAVAILABLE: - errorData[0] = E_ITEM_UNAVAILABLE; - errorData[1] = "That item is unavailable."; - break; - case BillingClient.BillingResponseCode.DEVELOPER_ERROR: - errorData[0] = E_DEVELOPER_ERROR; - errorData[1] = "Google is indicating that we have some issue connecting to payment."; - break; - case BillingClient.BillingResponseCode.ERROR: - errorData[0] = E_UNKNOWN; - errorData[1] = "An unknown or unexpected error has occured. Please try again later."; - break; - case BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED: - errorData[0] = E_ALREADY_OWNED; - errorData[1] = "You already own this item."; - break; - default: - errorData[0] = E_UNKNOWN; - errorData[1] = "Purchase failed with code: " + responseCode; - break; - } - Log.e(TAG, "Error Code : " + responseCode); - return errorData; - } -} diff --git a/android/src/main/java/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.java b/android/src/main/java/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.java deleted file mode 100644 index 5c72299c..00000000 --- a/android/src/main/java/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.dooboolab.flutterinapppurchase; - -import android.content.Context; -import android.content.pm.PackageManager; - -import java.util.ArrayList; - -import androidx.annotation.NonNull; -import io.flutter.embedding.engine.plugins.FlutterPlugin; -import io.flutter.embedding.engine.plugins.activity.ActivityAware; -import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding; -import io.flutter.plugin.common.BinaryMessenger; -import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.PluginRegistry.Registrar; - -/** FlutterInappPurchasePlugin */ -public class FlutterInappPurchasePlugin implements FlutterPlugin, ActivityAware { - private AndroidInappPurchasePlugin androidInappPurchasePlugin; - private AmazonInappPurchasePlugin amazonInappPurchasePlugin; - private Context context; - private MethodChannel channel; - - private static boolean isAndroid; - private static boolean isAmazon; - - @Override - public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { - onAttached(binding.getApplicationContext(), binding.getBinaryMessenger()); - } - - private void onAttached(Context context, BinaryMessenger messenger) { - isAndroid = isPackageInstalled(context, "com.android.vending"); - isAmazon = isPackageInstalled(context, "com.amazon.venezia"); - - // In the case of an amazon device which has been side loaded with the Google Play store, - // we should use the store the app was installed from. - if (isAmazon && isAndroid) { - if (isAppInstalledFrom(context, "amazon")) { - isAndroid = false; - } else { - isAmazon = false; - } - } - - channel = new MethodChannel(messenger, "flutter_inapp"); - - if (isAndroid) { - androidInappPurchasePlugin = new AndroidInappPurchasePlugin(); - androidInappPurchasePlugin.setContext(context); - androidInappPurchasePlugin.setChannel(channel); - channel.setMethodCallHandler(androidInappPurchasePlugin); - } else if (isAmazon) { - amazonInappPurchasePlugin = new AmazonInappPurchasePlugin(); - amazonInappPurchasePlugin.setContext(context); - amazonInappPurchasePlugin.setChannel(channel); - channel.setMethodCallHandler(amazonInappPurchasePlugin); - } - } - - @Override - public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { - channel.setMethodCallHandler(null); - channel = null; - - if (isAndroid) { - androidInappPurchasePlugin.setChannel(null); - } else if (isAmazon) { - amazonInappPurchasePlugin.setChannel(null); - } - } - - public static void registerWith(Registrar registrar) { - FlutterInappPurchasePlugin instance = new FlutterInappPurchasePlugin(); - instance.onAttached(registrar.context(), registrar.messenger()); - } - - @Override - public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) { - if (isAndroid) { - androidInappPurchasePlugin.setActivity(binding.getActivity()); - } else if (isAmazon) { - amazonInappPurchasePlugin.setActivity(binding.getActivity()); - } - } - - @Override - public void onDetachedFromActivity() { - if (isAndroid) { - androidInappPurchasePlugin.setActivity(null); - androidInappPurchasePlugin.onDetachedFromActivity(); - } else if (isAmazon) { - amazonInappPurchasePlugin.setActivity(null); - } - } - - @Override - public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) { - onAttachedToActivity(binding); - } - - @Override - public void onDetachedFromActivityForConfigChanges() { - onDetachedFromActivity(); - } - - private static boolean isPackageInstalled(Context ctx, String packageName) { - try { - ctx.getPackageManager().getPackageInfo(packageName, 0); - return true; - } catch (PackageManager.NameNotFoundException e) { - return false; - } - } - - public static final boolean isAppInstalledFrom(Context ctx, String installer) { - String installerPackageName = ctx.getPackageManager().getInstallerPackageName(ctx.getPackageName()); - return (installer != null && installerPackageName != null && installerPackageName.contains(installer)); - } - - private void setAndroidInappPurchasePlugin(AndroidInappPurchasePlugin androidInappPurchasePlugin) { - this.androidInappPurchasePlugin = androidInappPurchasePlugin; - } - - private void setAmazonInappPurchasePlugin(AmazonInappPurchasePlugin amazonInappPurchasePlugin) { - this.amazonInappPurchasePlugin = amazonInappPurchasePlugin; - } -} diff --git a/android/src/main/java/com/dooboolab/flutterinapppurchase/MethodResultWrapper.java b/android/src/main/java/com/dooboolab/flutterinapppurchase/MethodResultWrapper.java deleted file mode 100644 index a62d0863..00000000 --- a/android/src/main/java/com/dooboolab/flutterinapppurchase/MethodResultWrapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.dooboolab.flutterinapppurchase; - -import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.MethodChannel.Result; - -import android.os.Handler; -import android.os.Looper; - -// MethodChannel.Result wrapper that responds on the platform thread. -public class MethodResultWrapper implements Result { - private Result safeResult; - private MethodChannel safeChannel; - private Handler handler; - - MethodResultWrapper(Result result, MethodChannel channel) { - safeResult = result; - safeChannel = channel; - handler = new Handler(Looper.getMainLooper()); - } - - @Override - public void success(final Object result) { - handler.post( - new Runnable() { - @Override - public void run() { - safeResult.success(result); - } - }); - } - - @Override - public void error(final String errorCode, final String errorMessage, final Object errorDetails) { - handler.post( - new Runnable() { - @Override - public void run() { - safeResult.error(errorCode, errorMessage, errorDetails); - } - }); - } - - @Override - public void notImplemented() { - handler.post( - new Runnable() { - @Override - public void run() { - safeResult.notImplemented(); - } - }); - } - - public void invokeMethod(final String method, final Object arguments) { - handler.post( - new Runnable() { - @Override - public void run() { - safeChannel.invokeMethod(method, arguments, null); - } - }); - } -} \ No newline at end of file diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt new file mode 100644 index 00000000..614c8aef --- /dev/null +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt @@ -0,0 +1,266 @@ +package com.dooboolab.flutterinapppurchase + +import android.app.Activity +import android.content.Context +import android.util.Log +import com.amazon.device.iap.PurchasingListener +import com.amazon.device.iap.PurchasingService +import com.amazon.device.iap.model.* +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import io.flutter.plugin.common.MethodChannel.MethodCallHandler +import org.json.JSONArray +import org.json.JSONException +import org.json.JSONObject + +/** AmazonInappPurchasePlugin */ +class AmazonInappPurchasePlugin : MethodCallHandler { + private val TAG = "InappPurchasePlugin" + private var safeResult: MethodResultWrapper? = null + private var channel: MethodChannel? = null + private var context: Context? = null + private var activity: Activity? = null + fun setContext(context: Context?) { + this.context = context + } + + fun setActivity(activity: Activity?) { + this.activity = activity + } + + fun setChannel(channel: MethodChannel?) { + this.channel = channel + } + + override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { + safeResult = MethodResultWrapper(result, channel!!) + try { + PurchasingService.registerListener(context, purchasesUpdatedListener) + } catch (e: Exception) { + safeResult!!.error( + call.method, + "Call endConnection method if you want to start over.", + e.message + ) + } + when (call.method) { + "initConnection" -> { + PurchasingService.getUserData() + safeResult!!.success("Billing client ready") + } + "endConnection" -> { + safeResult!!.success("Billing client has ended.") + } + "showInAppMessages" -> { + //not supported on amazon + } + "consumeAllItems" -> { + // consumable is a separate type in amazon + safeResult!!.success("no-ops in amazon") + } + "getProducts", + "getSubscriptions" -> { + Log.d(TAG, call.method) + val skus = call.argument>("skus")!! + val productSkus: MutableSet = HashSet() + for (i in skus.indices) { + Log.d(TAG, "Adding " + skus[i]) + productSkus.add(skus[i]) + } + PurchasingService.getProductData(productSkus) + } + "getAvailableItemsByType" -> { + val type = call.argument("type") + Log.d(TAG, "gaibt=$type") + // NOTE: getPurchaseUpdates doesnt return Consumables which are FULFILLED + if (type == "inapp") { + PurchasingService.getPurchaseUpdates(true) + } else if (type == "subs") { + // Subscriptions are retrieved during inapp, so we just return empty list + safeResult!!.success("[]") + } else { + safeResult!!.notImplemented() + } + } + "getPurchaseHistoryByType" -> { + // No equivalent + safeResult!!.success("[]") + } + "buyItemByType" -> { + val type = call.argument("type") + //val obfuscatedAccountId = call.argument("obfuscatedAccountId") + //val obfuscatedProfileId = call.argument("obfuscatedProfileId") + val sku = call.argument("sku") + val oldSku = call.argument("oldSku") + //val prorationMode = call.argument("prorationMode")!! + Log.d(TAG, "type=$type||sku=$sku||oldsku=$oldSku") + val requestId = PurchasingService.purchase(sku) + Log.d(TAG, "resid=$requestId") + } + "consumeProduct" -> { + // consumable is a separate type in amazon + safeResult!!.success("no-ops in amazon") + } + else -> { + safeResult!!.notImplemented() + } + } + } + + private val purchasesUpdatedListener: PurchasingListener = object : PurchasingListener { + override fun onUserDataResponse(userDataResponse: UserDataResponse) { + Log.d(TAG, "oudr=$userDataResponse") + } + + // getItemsByType + override fun onProductDataResponse(response: ProductDataResponse) { + Log.d(TAG, "opdr=$response") + val status = response.requestStatus + Log.d(TAG, "onProductDataResponse: RequestStatus ($status)") + when (status) { + ProductDataResponse.RequestStatus.SUCCESSFUL -> { + Log.d( + TAG, + "onProductDataResponse: successful. The item data map in this response includes the valid SKUs" + ) + val productData = response.productData + //Log.d(TAG, "productData="+productData.toString()); + val unavailableSkus = response.unavailableSkus + Log.d( + TAG, + "onProductDataResponse: " + unavailableSkus.size + " unavailable skus" + ) + Log.d(TAG, "unavailableSkus=$unavailableSkus") + val items = JSONArray() + try { + for ((_, product) in productData) { + //val format = NumberFormat.getCurrencyInstance() + val item = JSONObject() + item.put("productId", product.sku) + item.put("price", product.price) + item.put("currency", null) + when (product.productType) { + ProductType.ENTITLED, ProductType.CONSUMABLE -> item.put( + "type", + "inapp" + ) + ProductType.SUBSCRIPTION -> item.put("type", "subs") + } + item.put("localizedPrice", product.price) + item.put("title", product.title) + item.put("description", product.description) + item.put("introductoryPrice", "") + item.put("subscriptionPeriodAndroid", "") + item.put("freeTrialPeriodAndroid", "") + item.put("introductoryPriceCyclesAndroid", 0) + item.put("introductoryPricePeriodAndroid", "") + Log.d(TAG, "opdr Putting $item") + items.put(item) + } + //System.err.println("Sending "+items.toString()); + safeResult!!.success(items.toString()) + } catch (e: JSONException) { + safeResult!!.error(TAG, "E_BILLING_RESPONSE_JSON_PARSE_ERROR", e.message) + } + } + ProductDataResponse.RequestStatus.FAILED -> { + safeResult!!.error(TAG, "FAILED", null) + Log.d(TAG, "onProductDataResponse: failed, should retry request") + safeResult!!.error(TAG, "NOT_SUPPORTED", null) + } + ProductDataResponse.RequestStatus.NOT_SUPPORTED -> { + Log.d(TAG, "onProductDataResponse: failed, should retry request") + safeResult!!.error(TAG, "NOT_SUPPORTED", null) + } + } + } + + // buyItemByType + override fun onPurchaseResponse(response: PurchaseResponse) { + Log.d(TAG, "opr=$response") + when (val status = response.requestStatus) { + PurchaseResponse.RequestStatus.SUCCESSFUL -> { + val receipt = response.receipt + PurchasingService.notifyFulfillment( + receipt.receiptId, + FulfillmentResult.FULFILLED + ) + val date = receipt.purchaseDate + val transactionDate = date.time + try { + val item = getPurchaseData( + receipt.sku, + receipt.receiptId, + receipt.receiptId, + transactionDate.toDouble() + ) + Log.d(TAG, "opr Putting $item") + safeResult!!.success(item.toString()) + safeResult!!.invokeMethod("purchase-updated", item.toString()) + } catch (e: JSONException) { + safeResult!!.error(TAG, "E_BILLING_RESPONSE_JSON_PARSE_ERROR", e.message) + } + } + PurchaseResponse.RequestStatus.FAILED -> safeResult!!.error( + TAG, + "buyItemByType", + "billingResponse is not ok: $status" + ) + else -> {} + } + } + + // getAvailableItemsByType + override fun onPurchaseUpdatesResponse(response: PurchaseUpdatesResponse) { + Log.d(TAG, "opudr=$response") + when (response.requestStatus) { + PurchaseUpdatesResponse.RequestStatus.SUCCESSFUL -> { + val items = JSONArray() + try { + val receipts = response.receipts + for (receipt in receipts) { + val date = receipt.purchaseDate + val transactionDate = date.time + val item = getPurchaseData( + receipt.sku, + receipt.receiptId, + receipt.receiptId, + transactionDate.toDouble() + ) + Log.d(TAG, "opudr Putting $item") + items.put(item) + } + safeResult!!.success(items.toString()) + } catch (e: JSONException) { + safeResult!!.error(TAG, "E_BILLING_RESPONSE_JSON_PARSE_ERROR", e.message) + } + } + PurchaseUpdatesResponse.RequestStatus.FAILED -> safeResult!!.error( + TAG, + "FAILED", + null + ) + PurchaseUpdatesResponse.RequestStatus.NOT_SUPPORTED -> { + Log.d(TAG, "onPurchaseUpdatesResponse: failed, should retry request") + safeResult!!.error(TAG, "NOT_SUPPORTED", null) + } + } + } + } + + @Throws(JSONException::class) + fun getPurchaseData( + productId: String?, transactionId: String?, transactionReceipt: String?, + transactionDate: Double? + ): JSONObject { + val item = JSONObject() + item.put("productId", productId) + item.put("transactionId", transactionId) + item.put("transactionReceipt", transactionReceipt) + item.put("transactionDate", (transactionDate!!).toString()) + item.put("dataAndroid", null) + item.put("signatureAndroid", null) + item.put("purchaseToken", null) + return item + } +} \ No newline at end of file diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt new file mode 100644 index 00000000..358d17b7 --- /dev/null +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt @@ -0,0 +1,523 @@ +package com.dooboolab.flutterinapppurchase + +import android.app.Activity +import android.app.Application +import android.app.Application.ActivityLifecycleCallbacks +import android.content.Context +import android.os.Bundle +import android.util.Log +import com.android.billingclient.api.* +import com.android.billingclient.api.BillingFlowParams.* +import io.flutter.plugin.common.FlutterException +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import io.flutter.plugin.common.MethodChannel.MethodCallHandler +import org.json.JSONArray +import org.json.JSONException +import org.json.JSONObject + +/** + * AndroidInappPurchasePlugin + */ +class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, + ActivityLifecycleCallbacks { + private val TAG = "InappPurchasePlugin" + private var safeResult: MethodResultWrapper? = null + private var billingClient: BillingClient? = null + private var context: Context? = null + private var activity: Activity? = null + private var channel: MethodChannel? = null + fun setContext(context: Context?) { + this.context = context + } + fun setActivity(activity: Activity?) { + this.activity = activity + } + fun setChannel(channel: MethodChannel?) { + this.channel = channel + } + fun onDetachedFromActivity() { + endBillingClientConnection() + } + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {} + override fun onActivityStarted(activity: Activity) {} + override fun onActivityResumed(activity: Activity) {} + override fun onActivityPaused(activity: Activity) {} + override fun onActivityDestroyed(activity: Activity) { + if (this.activity === activity && context != null) { + (context as Application?)!!.unregisterActivityLifecycleCallbacks(this) + endBillingClientConnection() + } + } + override fun onActivityStopped(activity: Activity) {} + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} + override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { + safeResult = MethodResultWrapper(result, channel!!) + val safeChannel = MethodResultWrapper(result, channel!!) + if (call.method == "initConnection") { + if (billingClient != null) { + safeChannel.success("Already started. Call endConnection method if you want to start over.") + return + } + billingClient = BillingClient.newBuilder(context!!).setListener(purchasesUpdatedListener) + .enablePendingPurchases() + .build() + billingClient!!.startConnection(object : BillingClientStateListener { + private var alreadyFinished = false + override fun onBillingSetupFinished(billingResult: BillingResult) { + try { + val responseCode = billingResult.responseCode + if (responseCode == BillingClient.BillingResponseCode.OK) { + val item = JSONObject() + item.put("connected", true) + safeChannel.invokeMethod("connection-updated", item.toString()) + if (alreadyFinished) return + alreadyFinished = true + safeChannel.success("Billing client ready") + return + } else { + val item = JSONObject() + item.put("connected", false) + safeChannel.invokeMethod("connection-updated", item.toString()) + if (alreadyFinished) return + alreadyFinished = true + safeChannel.error(call.method, "responseCode: $responseCode", "") + return + } + } catch (je: JSONException) { + je.printStackTrace() + } + } + + override fun onBillingServiceDisconnected() { + try { + val item = JSONObject() + item.put("connected", false) + safeChannel.invokeMethod("connection-updated", item.toString()) + return + } catch (je: JSONException) { + je.printStackTrace() + } + } + }) + return + } else if (call.method == "endConnection") { + if (billingClient == null) { + safeChannel.success("Already ended.") + }else{ + endBillingClientConnection(safeChannel) + } + return + } + + if (billingClient == null || !billingClient!!.isReady) { + safeChannel.error( + call.method, + BillingError.E_NOT_PREPARED, + "IAP not prepared. Check if Google Play service is available." + ) + return + } + + when(call.method){ + "showInAppMessages" -> showInAppMessages(safeChannel) + "consumeAllItems" -> consumeAllItems(safeChannel, call) + "getProducts" -> getProductsByType(BillingClient.SkuType.INAPP, call, safeChannel) + "getSubscriptions" -> getProductsByType(BillingClient.SkuType.SUBS, call, safeChannel) + "getAvailableItemsByType" -> getAvailableItemsByType(call, safeChannel) + "getPurchaseHistoryByType" -> getPurchaseHistoryByType(call, safeChannel) + "buyItemByType" -> buyProduct(call, safeChannel) + "acknowledgePurchase" -> acknowledgePurchase(call, safeChannel) + "consumeProduct" -> consumeProduct(call, safeChannel) + else -> safeChannel.notImplemented() + } + } + + private fun showInAppMessages(safeChannel: MethodResultWrapper) { + val inAppMessageParams = InAppMessageParams.newBuilder() + .addInAppMessageCategoryToShow(InAppMessageParams.InAppMessageCategoryId.TRANSACTIONAL) + .build() + + billingClient!!.showInAppMessages(activity!!, inAppMessageParams) { inAppMessageResult -> + safeChannel.invokeMethod("on-in-app-message", inAppMessageResult.responseCode) + } + } + + private fun consumeAllItems( + safeChannel: MethodResultWrapper, + call: MethodCall + ) { + try { + val array = ArrayList() + billingClient!!.queryPurchasesAsync(BillingClient.SkuType.INAPP) + { billingResult, skuDetailsList -> + if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) { + if (skuDetailsList.size == 0) { + safeChannel.error( + call.method, + "refreshItem", + "No purchases found" + ) + return@queryPurchasesAsync + } + + for (purchase in skuDetailsList) { + val consumeParams = ConsumeParams.newBuilder() + .setPurchaseToken(purchase.purchaseToken) + .build() + val listener = ConsumeResponseListener { _, outToken -> + array.add(outToken) + if (skuDetailsList.size == array.size) { + try { + safeChannel.success(array.toString()) + return@ConsumeResponseListener + } catch (e: FlutterException) { + Log.e(TAG, e.message!!) + } + } + } + billingClient!!.consumeAsync(consumeParams, listener) + } + } else { + safeChannel.error( + call.method, "refreshItem", + "No results for query" + ) + } + } + + } catch (err: Error) { + safeChannel.error(call.method, err.message, "") + } + } + + private fun getAvailableItemsByType( + call: MethodCall, + safeChannel: MethodResultWrapper + ) { + val type = if(call.argument("type") == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP + val items = JSONArray() + billingClient!!.queryPurchasesAsync(type) { billingResult, skuDetailsList -> + if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) { + for (purchase in skuDetailsList) { + val item = JSONObject() + item.put("productId", purchase.skus[0]) + item.put("transactionId", purchase.orderId) + item.put("transactionDate", purchase.purchaseTime) + item.put("transactionReceipt", purchase.originalJson) + item.put("purchaseToken", purchase.purchaseToken) + item.put("signatureAndroid", purchase.signature) + item.put("purchaseStateAndroid", purchase.purchaseState) + if (type == BillingClient.SkuType.INAPP) { + item.put("isAcknowledgedAndroid", purchase.isAcknowledged) + } else if (type == BillingClient.SkuType.SUBS) { + item.put("autoRenewingAndroid", purchase.isAutoRenewing) + } + items.put(item) + } + safeChannel.success(items.toString()) + } else { + safeChannel.error( + call.method, billingResult.debugMessage, + "responseCode:${billingResult.responseCode}" + ) + } + } + } + + private fun consumeProduct( + call: MethodCall, + safeChannel: MethodResultWrapper + ) { + val token = call.argument("token") + val params = ConsumeParams.newBuilder() + .setPurchaseToken(token!!) + .build() + billingClient!!.consumeAsync(params, ConsumeResponseListener { billingResult, _ -> + if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) { + val errorData = BillingError.getErrorFromResponseData(billingResult.responseCode) + safeChannel.error(call.method, errorData.code, errorData.message) + return@ConsumeResponseListener + } + try { + val item = JSONObject() + item.put("responseCode", billingResult.responseCode) + item.put("debugMessage", billingResult.debugMessage) + val errorData = BillingError.getErrorFromResponseData(billingResult.responseCode) + item.put("code", errorData.code) + item.put("message", errorData.message) + safeChannel.success(item.toString()) + return@ConsumeResponseListener + } catch (je: JSONException) { + safeChannel.error( + TAG, + BillingError.E_BILLING_RESPONSE_JSON_PARSE_ERROR, + je.message + ) + return@ConsumeResponseListener + } + }) + } + + private fun acknowledgePurchase( + call: MethodCall, + safeChannel: MethodResultWrapper + ) { + val token = call.argument("token") + val acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder() + .setPurchaseToken(token!!) + .build() + billingClient!!.acknowledgePurchase( + acknowledgePurchaseParams, + AcknowledgePurchaseResponseListener { billingResult -> + if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) { + val errorData = BillingError.getErrorFromResponseData(billingResult.responseCode) + safeChannel.error(call.method, errorData.code, errorData.message) + return@AcknowledgePurchaseResponseListener + } + try { + val item = JSONObject() + item.put("responseCode", billingResult.responseCode) + item.put("debugMessage", billingResult.debugMessage) + val errorData = BillingError.getErrorFromResponseData(billingResult.responseCode) + item.put("code", errorData.code) + item.put("message", errorData.message) + safeChannel.success(item.toString()) + } catch (je: JSONException) { + je.printStackTrace() + safeChannel.error( + TAG, + BillingError.E_BILLING_RESPONSE_JSON_PARSE_ERROR, + je.message + ) + } + }) + } + + private fun getPurchaseHistoryByType( + call: MethodCall, + safeChannel: MethodResultWrapper + ) { + val type = if(call.argument("type") == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP + + billingClient!!.queryPurchaseHistoryAsync( + type, + PurchaseHistoryResponseListener { billingResult, purchaseHistoryRecordList -> + if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) { + val errorData = BillingError.getErrorFromResponseData(billingResult.responseCode) + safeChannel.error(call.method, errorData.code, errorData.message) + return@PurchaseHistoryResponseListener + } + val items = JSONArray() + try { + for (purchase in purchaseHistoryRecordList!!) { + val item = JSONObject() + item.put("productId", purchase.skus[0]) + item.put("transactionDate", purchase.purchaseTime) + item.put("transactionReceipt", purchase.originalJson) + item.put("purchaseToken", purchase.purchaseToken) + item.put("dataAndroid", purchase.originalJson) + item.put("signatureAndroid", purchase.signature) + items.put(item) + } + safeChannel.success(items.toString()) + return@PurchaseHistoryResponseListener + } catch (je: JSONException) { + je.printStackTrace() + safeChannel.error(TAG, BillingError.E_BILLING_RESPONSE_JSON_PARSE_ERROR, je.message) + } + }) + } + + private fun getProductsByType( + skuType: String, + call: MethodCall, + safeChannel: MethodResultWrapper + ) { + val skuArr = call.argument>("skus")!! + val skuList = ArrayList() + for (i in skuArr.indices) { + skuList.add(skuArr[i]) + } + + billingClient!!.querySkuDetailsAsync( + SkuDetailsParams.newBuilder().setSkusList(skuList).setType(skuType).build() + ) { billingResult, skuDetailsList -> + if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) { + val errorData = BillingError.getErrorFromResponseData(billingResult.responseCode) + safeChannel.error(call.method, errorData.code, errorData.message) + return@querySkuDetailsAsync + } + for (sku in skuDetailsList!!) { + if (!skus.contains(sku)) { + skus.add(sku) + } + } + try { + val items = JSONArray() + for (skuDetails in skuDetailsList) { + val item = JSONObject() + item.put("productId", skuDetails.sku) + item.put("price", (skuDetails.priceAmountMicros / 1000000f).toString()) + item.put("currency", skuDetails.priceCurrencyCode) + item.put("type", skuDetails.type) + item.put("localizedPrice", skuDetails.price) + item.put("title", skuDetails.title) + item.put("description", skuDetails.description) + item.put("introductoryPrice", skuDetails.introductoryPrice) + item.put("subscriptionPeriodAndroid", skuDetails.subscriptionPeriod) + item.put("freeTrialPeriodAndroid", skuDetails.freeTrialPeriod) + item.put("introductoryPriceCyclesAndroid", skuDetails.introductoryPriceCycles) + item.put("introductoryPricePeriodAndroid", skuDetails.introductoryPricePeriod) + // new + item.put("iconUrl", skuDetails.iconUrl) + item.put("originalJson", skuDetails.originalJson) + item.put("originalPrice", (skuDetails.priceAmountMicros / 1000000f).toDouble()) + items.put(item) + } + safeChannel.success(items.toString()) + return@querySkuDetailsAsync + } catch (je: JSONException) { + je.printStackTrace() + safeChannel.error(TAG, BillingError.E_BILLING_RESPONSE_JSON_PARSE_ERROR, je.message) + } catch (fe: FlutterException) { + safeChannel.error(call.method, fe.message, fe.localizedMessage) + return@querySkuDetailsAsync + } + } + } + + private fun buyProduct( + call: MethodCall, + safeChannel: MethodResultWrapper + ) { + val type = if(call.argument("type") == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP + val obfuscatedAccountId = call.argument("obfuscatedAccountId") + val obfuscatedProfileId = call.argument("obfuscatedProfileId") + val sku = call.argument("sku") + val oldSku = call.argument("oldSku") + val prorationMode = call.argument("prorationMode")!! + val purchaseToken = call.argument("purchaseToken") + val builder = newBuilder() + var selectedSku: SkuDetails? = null + for (skuDetail in skus) { + if (skuDetail.sku == sku) { + selectedSku = skuDetail + break + } + } + if (selectedSku == null) { + val debugMessage = + "The sku was not found. Please fetch setObfuscatedAccountIdproducts first by calling getItems" + safeChannel.error(TAG, "buyItemByType", debugMessage) + return + } + builder.setSkuDetails(selectedSku) + + val params = SubscriptionUpdateParams.newBuilder() + if (purchaseToken != null) { + params.setOldSkuPurchaseToken(purchaseToken) + } + if (oldSku != null) { + params.setOldSkuPurchaseToken(oldSku) + } + if (obfuscatedAccountId != null) { + builder.setObfuscatedAccountId(obfuscatedAccountId) + } + if (obfuscatedProfileId != null) { + builder.setObfuscatedProfileId(obfuscatedProfileId) + } + + when (prorationMode) { + -1 -> {} //ignore + ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE -> { + params.setReplaceSkusProrationMode(ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE) + if (type != BillingClient.SkuType.SUBS) { + safeChannel.error( + TAG, + "buyItemByType", + "IMMEDIATE_AND_CHARGE_PRORATED_PRICE for proration mode only works in subscription purchase." + ) + return + } + } + ProrationMode.IMMEDIATE_WITHOUT_PRORATION, + ProrationMode.DEFERRED, + ProrationMode.IMMEDIATE_WITH_TIME_PRORATION, + ProrationMode.IMMEDIATE_AND_CHARGE_FULL_PRICE -> + params.setReplaceSkusProrationMode(prorationMode) + else -> params.setReplaceSkusProrationMode(ProrationMode.UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY) + } + if (purchaseToken != null) { + builder.setSubscriptionUpdateParams(params.build()) + } + if (activity != null) { + billingClient!!.launchBillingFlow(activity!!, builder.build()) + } + } + + private val purchasesUpdatedListener = PurchasesUpdatedListener { billingResult, purchases -> + try { + if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) { + val json = JSONObject() + json.put("responseCode", billingResult.responseCode) + json.put("debugMessage", billingResult.debugMessage) + val errorData = BillingError.getErrorFromResponseData(billingResult.responseCode) + json.put("code", errorData.code) + json.put("message", errorData.message) + safeResult!!.invokeMethod("purchase-error", json.toString()) + return@PurchasesUpdatedListener + } + if (purchases != null) { + for (purchase in purchases) { + val item = JSONObject() + item.put("productId", purchase.skus[0]) + item.put("transactionId", purchase.orderId) + item.put("transactionDate", purchase.purchaseTime) + item.put("transactionReceipt", purchase.originalJson) + item.put("purchaseToken", purchase.purchaseToken) + item.put("dataAndroid", purchase.originalJson) + item.put("signatureAndroid", purchase.signature) + item.put("purchaseStateAndroid", purchase.purchaseState) + item.put("autoRenewingAndroid", purchase.isAutoRenewing) + item.put("isAcknowledgedAndroid", purchase.isAcknowledged) + item.put("packageNameAndroid", purchase.packageName) + item.put("developerPayloadAndroid", purchase.developerPayload) + val accountIdentifiers = purchase.accountIdentifiers + if (accountIdentifiers != null) { + item.put("obfuscatedAccountIdAndroid", accountIdentifiers.obfuscatedAccountId) + item.put("obfuscatedProfileIdAndroid", accountIdentifiers.obfuscatedProfileId) + } + safeResult!!.invokeMethod("purchase-updated", item.toString()) + return@PurchasesUpdatedListener + } + } else { + val json = JSONObject() + json.put("responseCode", billingResult.responseCode) + json.put("debugMessage", billingResult.debugMessage) + val errorData = BillingError.getErrorFromResponseData(billingResult.responseCode) + json.put("code", errorData.code) + json.put("message", "purchases returns null.") + safeResult!!.invokeMethod("purchase-error", json.toString()) + return@PurchasesUpdatedListener + } + } catch (je: JSONException) { + safeResult!!.invokeMethod("purchase-error", je.message) + return@PurchasesUpdatedListener + } + } + + private fun endBillingClientConnection(safeChannel: MethodResultWrapper? = null) { + try { + billingClient?.endConnection() + billingClient = null + safeChannel?.success("Billing client has ended.") + } catch (e: Exception) { + safeChannel?.error("client end connection", e.message, "") + } + } + + companion object { + private var skus: ArrayList = arrayListOf() + } +} \ No newline at end of file diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/BillingError.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/BillingError.kt new file mode 100644 index 00000000..93c81644 --- /dev/null +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/BillingError.kt @@ -0,0 +1,50 @@ +package com.dooboolab.flutterinapppurchase + +import android.util.Log +import com.android.billingclient.api.BillingClient.BillingResponseCode + +class BillingError { + companion object { + private const val TAG = "DoobooUtils" + private const val E_UNKNOWN = "E_UNKNOWN" + const val E_NOT_PREPARED = "E_NOT_PREPARED" + private const val E_NOT_ENDED = "E_NOT_ENDED" + private const val E_USER_CANCELLED = "E_USER_CANCELLED" + private const val E_ITEM_UNAVAILABLE = "E_ITEM_UNAVAILABLE" + private const val E_NETWORK_ERROR = "E_NETWORK_ERROR" + private const val E_SERVICE_ERROR = "E_SERVICE_ERROR" + private const val E_ALREADY_OWNED = "E_ALREADY_OWNED" + private const val E_REMOTE_ERROR = "E_REMOTE_ERROR" + private const val E_USER_ERROR = "E_USER_ERROR" + private const val E_DEVELOPER_ERROR = "E_DEVELOPER_ERROR" + const val E_BILLING_RESPONSE_JSON_PARSE_ERROR = "E_BILLING_RESPONSE_JSON_PARSE_ERROR" + + fun getErrorFromResponseData(responseCode: Int): ErrorData { + Log.e(TAG, "Error Code : $responseCode") + return when (responseCode) { + BillingResponseCode.FEATURE_NOT_SUPPORTED -> + ErrorData(E_SERVICE_ERROR,"This feature is not available on your device.") + BillingResponseCode.SERVICE_DISCONNECTED -> + ErrorData(E_NETWORK_ERROR, "The service is disconnected (check your internet connection.)") + BillingResponseCode.OK -> ErrorData("OK","") + BillingResponseCode.USER_CANCELED -> + ErrorData(E_USER_CANCELLED, "Payment is Cancelled.") + BillingResponseCode.SERVICE_UNAVAILABLE -> + ErrorData(E_SERVICE_ERROR, "The service is unreachable. This may be your internet connection, or the Play Store may be down.") + BillingResponseCode.BILLING_UNAVAILABLE -> + ErrorData(E_SERVICE_ERROR, "Billing is unavailable. This may be a problem with your device, or the Play Store may be down.") + BillingResponseCode.ITEM_UNAVAILABLE -> + ErrorData( E_ITEM_UNAVAILABLE, "That item is unavailable.") + BillingResponseCode.DEVELOPER_ERROR -> + ErrorData(E_DEVELOPER_ERROR, "Google is indicating that we have some issue connecting to payment.") + BillingResponseCode.ERROR -> + ErrorData(E_UNKNOWN,"An unknown or unexpected error has occured. Please try again later.") + BillingResponseCode.ITEM_ALREADY_OWNED -> + ErrorData(E_ALREADY_OWNED, "You already own this item.") + else -> ErrorData(E_UNKNOWN,"Purchase failed with code: $responseCode") + } + } + } +} + +data class ErrorData(val code: String, val message: String) \ No newline at end of file diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.kt new file mode 100644 index 00000000..ebbb32ac --- /dev/null +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.kt @@ -0,0 +1,116 @@ +package com.dooboolab.flutterinapppurchase + +import io.flutter.embedding.engine.plugins.FlutterPlugin +import io.flutter.embedding.engine.plugins.activity.ActivityAware +import android.content.Context +import io.flutter.plugin.common.MethodChannel +import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding +import io.flutter.plugin.common.BinaryMessenger +import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding +import io.flutter.plugin.common.PluginRegistry.Registrar +import android.content.pm.PackageManager.NameNotFoundException + +/** FlutterInappPurchasePlugin */ +class FlutterInappPurchasePlugin : FlutterPlugin, ActivityAware { + private var androidInappPurchasePlugin: AndroidInappPurchasePlugin? = null + private var amazonInappPurchasePlugin: AmazonInappPurchasePlugin? = null + private var channel: MethodChannel? = null + override fun onAttachedToEngine(binding: FlutterPluginBinding) { + onAttached(binding.applicationContext, binding.binaryMessenger) + } + + private fun onAttached(context: Context, messenger: BinaryMessenger) { + isAndroid = isPackageInstalled(context, "com.android.vending") + isAmazon = isPackageInstalled(context, "com.amazon.venezia") + + // In the case of an amazon device which has been side loaded with the Google Play store, + // we should use the store the app was installed from. + if (isAmazon && isAndroid) { + if (isAppInstalledFrom(context, "amazon")) { + isAndroid = false + } else { + isAmazon = false + } + } + channel = MethodChannel(messenger, "flutter_inapp") + if (isAndroid) { + androidInappPurchasePlugin = AndroidInappPurchasePlugin() + androidInappPurchasePlugin!!.setContext(context) + androidInappPurchasePlugin!!.setChannel(channel) + channel!!.setMethodCallHandler(androidInappPurchasePlugin) + } else if (isAmazon) { + amazonInappPurchasePlugin = AmazonInappPurchasePlugin() + amazonInappPurchasePlugin!!.setContext(context) + amazonInappPurchasePlugin!!.setChannel(channel) + channel!!.setMethodCallHandler(amazonInappPurchasePlugin) + } + } + + override fun onDetachedFromEngine(binding: FlutterPluginBinding) { + channel!!.setMethodCallHandler(null) + channel = null + if (isAndroid) { + androidInappPurchasePlugin!!.setChannel(null) + } else if (isAmazon) { + amazonInappPurchasePlugin!!.setChannel(null) + } + } + + override fun onAttachedToActivity(binding: ActivityPluginBinding) { + if (isAndroid) { + androidInappPurchasePlugin!!.setActivity(binding.activity) + } else if (isAmazon) { + amazonInappPurchasePlugin!!.setActivity(binding.activity) + } + } + + override fun onDetachedFromActivity() { + if (isAndroid) { + androidInappPurchasePlugin!!.setActivity(null) + androidInappPurchasePlugin!!.onDetachedFromActivity() + } else if (isAmazon) { + amazonInappPurchasePlugin!!.setActivity(null) + } + } + + override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) { + onAttachedToActivity(binding) + } + + override fun onDetachedFromActivityForConfigChanges() { + onDetachedFromActivity() + } + + private fun setAndroidInappPurchasePlugin(androidInappPurchasePlugin: AndroidInappPurchasePlugin) { + this.androidInappPurchasePlugin = androidInappPurchasePlugin + } + + private fun setAmazonInappPurchasePlugin(amazonInappPurchasePlugin: AmazonInappPurchasePlugin) { + this.amazonInappPurchasePlugin = amazonInappPurchasePlugin + } + + companion object { + private var isAndroid = false + private var isAmazon = false + fun registerWith(registrar: Registrar) { + val instance = FlutterInappPurchasePlugin() + instance.onAttached(registrar.context(), registrar.messenger()) + } + + private fun isPackageInstalled(ctx: Context, packageName: String): Boolean { + return try { + ctx.packageManager.getPackageInfo(packageName, 0) + true + } catch (e: NameNotFoundException) { + false + } + } + + fun isAppInstalledFrom(ctx: Context, installer: String?): Boolean { + val installerPackageName = ctx.packageManager.getInstallerPackageName(ctx.packageName) + return installer != null && installerPackageName != null && installerPackageName.contains( + installer + ) + } + } +} \ No newline at end of file diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/MethodResultWrapper.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/MethodResultWrapper.kt new file mode 100644 index 00000000..a5abd8db --- /dev/null +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/MethodResultWrapper.kt @@ -0,0 +1,30 @@ +package com.dooboolab.flutterinapppurchase + +import android.os.Handler +import io.flutter.plugin.common.MethodChannel +import java.lang.Runnable +import android.os.Looper + +// MethodChannel.Result wrapper that responds on the platform thread. +class MethodResultWrapper internal constructor( + private val safeResult: MethodChannel.Result, + private val safeChannel: MethodChannel +) : MethodChannel.Result { + private val handler: Handler = Handler(Looper.getMainLooper()) + override fun success(result: Any?) { + handler.post { safeResult.success(result) } + } + + override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) { + handler.post { safeResult.error(errorCode, errorMessage, errorDetails) } + } + + override fun notImplemented() { + handler.post { safeResult.notImplemented() } + } + + fun invokeMethod(method: String?, arguments: Any?) { + handler.post { safeChannel.invokeMethod(method!!, arguments, null) } + } + +} \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index db379ee2..08784863 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -35,7 +35,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.dooboolab.flutterinapppurchaseexample" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/example/android/build.gradle b/example/android/build.gradle index 71be3d3d..2797bde4 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:7.0.4' } } diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index 64d98463..2414739e 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -40,6 +40,9 @@ class FlutterInappPurchase { static Stream get purchasePromoted => _purchasePromotedController!.stream; + static StreamController? _onInAppMessageController; + static Stream get inAppMessageAndroid => _onInAppMessageController!.stream; + /// Defining the [MethodChannel] for Flutter_Inapp_Purchase static final MethodChannel _channel = const MethodChannel('flutter_inapp'); @@ -116,9 +119,8 @@ class FlutterInappPurchase { Future> getProducts(List skus) async { if (_platform.isAndroid) { dynamic result = await _channel.invokeMethod( - 'getItemsByType', + 'getProducts', { - 'type': describeEnum(_TypeInApp.inapp), 'skus': skus.toList(), }, ); @@ -142,9 +144,8 @@ class FlutterInappPurchase { Future> getSubscriptions(List skus) async { if (_platform.isAndroid) { dynamic result = await _channel.invokeMethod( - 'getItemsByType', + 'getSubscriptions', { - 'type': describeEnum(_TypeInApp.subs), 'skus': skus.toList(), }, ); @@ -193,6 +194,15 @@ class FlutterInappPurchase { code: _platform.operatingSystem, message: "platform not supported"); } + /// Android only, Google Play will show users messaging during grace period + /// and account hold once per day and provide them an opportunity to fix their + /// payment without leaving the app + Future showInAppMessageAndroid(){ + if(!_platform.isAndroid)return Future.value(); + _onInAppMessageController ??= StreamController.broadcast(); + return _channel.invokeMethod('showInAppMessages'); + } + /// Get all non-consumed purchases made on `Android` and `iOS`. /// /// This is identical to [getPurchaseHistory] on `iOS` @@ -452,10 +462,14 @@ class FlutterInappPurchase { 'token': purchasedItem.purchaseToken, }); } else { - return await _channel - .invokeMethod('acknowledgePurchase', { - 'token': purchasedItem.purchaseToken, - }); + if(purchasedItem.isAcknowledgedAndroid == true){ + return Future.value(null); + }else{ + return await _channel.invokeMethod('acknowledgePurchase', { + 'token': purchasedItem.purchaseToken, + }); + } + } } else if (_platform.isIOS) { return await _channel.invokeMethod('finishTransaction', { @@ -598,6 +612,7 @@ class FlutterInappPurchase { _connectionController ??= StreamController.broadcast(); _purchasePromotedController ??= StreamController.broadcast(); + _channel.setMethodCallHandler((MethodCall call) { switch (call.method) { case "purchase-updated": @@ -616,6 +631,10 @@ class FlutterInappPurchase { String? productId = call.arguments; _purchasePromotedController!.add(productId); break; + case "on-in-app-message": + final int code = call.arguments; + _onInAppMessageController?.add(code); + break; default: throw ArgumentError('Unknown method ${call.method}'); } diff --git a/pubspec.yaml b/pubspec.yaml index 3509f692..3cb01428 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_inapp_purchase description: In App Purchase plugin for flutter. This project has been forked by react-native-iap and we are willing to share same experience with that on react-native. -version: 5.2.0 +version: 5.3.0 homepage: https://github.com/dooboolab/flutter_inapp_purchase/blob/main/pubspec.yaml environment: sdk: ">=2.12.0 <3.0.0" @@ -30,34 +30,6 @@ flutter: android: package: com.dooboolab.flutterinapppurchase pluginClass: FlutterInappPurchasePlugin + mainClass: FlutterInappPurchasePlugin ios: - pluginClass: FlutterInappPurchasePlugin - # To add assets to your plugin package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.io/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.io/assets-and-images/#resolution-aware. - # To add custom fonts to your plugin package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.io/custom-fonts/#from-packages + pluginClass: FlutterInappPurchasePlugin \ No newline at end of file From 42c843801049b8ce4c051a0c2e1cfad5040ee3e8 Mon Sep 17 00:00:00 2001 From: Marian Date: Sat, 21 May 2022 18:06:10 +0200 Subject: [PATCH 02/13] optimized import --- lib/flutter_inapp_purchase.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index 2414739e..e224ecaa 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -4,7 +4,6 @@ import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; -import 'package:meta/meta.dart'; import 'package:platform/platform.dart'; import 'modules.dart'; From 4fa6abca46126664300a2f8f3bb5a13a0751ad39 Mon Sep 17 00:00:00 2001 From: Marian Date: Sat, 21 May 2022 18:14:52 +0200 Subject: [PATCH 03/13] fix format --- lib/flutter_inapp_purchase.dart | 20 ++++++++++---------- lib/modules.dart | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index e224ecaa..4e536282 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -40,7 +40,8 @@ class FlutterInappPurchase { _purchasePromotedController!.stream; static StreamController? _onInAppMessageController; - static Stream get inAppMessageAndroid => _onInAppMessageController!.stream; + static Stream get inAppMessageAndroid => + _onInAppMessageController!.stream; /// Defining the [MethodChannel] for Flutter_Inapp_Purchase static final MethodChannel _channel = const MethodChannel('flutter_inapp'); @@ -196,8 +197,8 @@ class FlutterInappPurchase { /// Android only, Google Play will show users messaging during grace period /// and account hold once per day and provide them an opportunity to fix their /// payment without leaving the app - Future showInAppMessageAndroid(){ - if(!_platform.isAndroid)return Future.value(); + Future showInAppMessageAndroid() { + if (!_platform.isAndroid) return Future.value(); _onInAppMessageController ??= StreamController.broadcast(); return _channel.invokeMethod('showInAppMessages'); } @@ -461,14 +462,14 @@ class FlutterInappPurchase { 'token': purchasedItem.purchaseToken, }); } else { - if(purchasedItem.isAcknowledgedAndroid == true){ + if (purchasedItem.isAcknowledgedAndroid == true) { return Future.value(null); - }else{ - return await _channel.invokeMethod('acknowledgePurchase', { + } else { + return await _channel + .invokeMethod('acknowledgePurchase', { 'token': purchasedItem.purchaseToken, }); } - } } else if (_platform.isIOS) { return await _channel.invokeMethod('finishTransaction', { @@ -514,8 +515,8 @@ class FlutterInappPurchase { /// This method is NOT secure and untested in production. Future checkSubscribed({ required String sku, - Duration duration: const Duration(days: 30), - Duration grace: const Duration(days: 3), + Duration duration = const Duration(days: 30), + Duration grace = const Duration(days: 3), }) async { if (_platform.isIOS) { var history = @@ -611,7 +612,6 @@ class FlutterInappPurchase { _connectionController ??= StreamController.broadcast(); _purchasePromotedController ??= StreamController.broadcast(); - _channel.setMethodCallHandler((MethodCall call) { switch (call.method) { case "purchase-updated": diff --git a/lib/modules.dart b/lib/modules.dart index c7a9d143..011a65a0 100644 --- a/lib/modules.dart +++ b/lib/modules.dart @@ -85,7 +85,7 @@ class IAPItem { /// and then get IAPItem from "str" above /// IAPItem item = IAPItem.fromJSON(convert.jsonDecode(str)); Map toJson() { - final Map data = new Map(); + final Map data = Map(); data['productId'] = this.productId; data['price'] = this.price; data['currency'] = this.currency; @@ -181,7 +181,7 @@ class DiscountIOS { subscriptionPeriod = json['subscriptionPeriod'] as String?; Map toJson() { - final Map data = new Map(); + final Map data = Map(); data['identifier'] = this.identifier; data['type'] = this.type; data['numberOfPeriods'] = this.numberOfPeriods; From 3ecf5f116f51f703a30d83a8d5f3c0f0562788b0 Mon Sep 17 00:00:00 2001 From: Marian Date: Sat, 21 May 2022 18:49:42 +0200 Subject: [PATCH 04/13] update test --- .../AndroidInappPurchasePlugin.kt | 1 + lib/flutter_inapp_purchase.dart | 6 +- test/flutter_inapp_purchase_test.dart | 58 +++++++++---------- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt index 358d17b7..eafad8bf 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt @@ -141,6 +141,7 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, billingClient!!.showInAppMessages(activity!!, inAppMessageParams) { inAppMessageResult -> safeChannel.invokeMethod("on-in-app-message", inAppMessageResult.responseCode) } + safeChannel.success("show in app messages ready") } private fun consumeAllItems( diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index 4e536282..f2d30009 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -197,10 +197,10 @@ class FlutterInappPurchase { /// Android only, Google Play will show users messaging during grace period /// and account hold once per day and provide them an opportunity to fix their /// payment without leaving the app - Future showInAppMessageAndroid() { - if (!_platform.isAndroid) return Future.value(); + Future showInAppMessageAndroid()async { + if (!_platform.isAndroid) return Future.value(""); _onInAppMessageController ??= StreamController.broadcast(); - return _channel.invokeMethod('showInAppMessages'); + return await _channel.invokeMethod('showInAppMessages'); } /// Get all non-consumed purchases made on `Android` and `iOS`. diff --git a/test/flutter_inapp_purchase_test.dart b/test/flutter_inapp_purchase_test.dart index a3f2eb02..7ac54101 100644 --- a/test/flutter_inapp_purchase_test.dart +++ b/test/flutter_inapp_purchase_test.dart @@ -13,40 +13,36 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); group('FlutterInappPurchase', () { - group('platformVersion', () { - final List log = []; - setUp(() { - FlutterInappPurchase(FlutterInappPurchase.private(FakePlatform( - operatingSystem: 'android', - ))); + group('showInAppMessageAndroid', (){ + group('for Android', () { + final List log = []; + setUp(() { + FlutterInappPurchase(FlutterInappPurchase.private( + FakePlatform(operatingSystem: "android"))); - FlutterInappPurchase.channel - .setMockMethodCallHandler((MethodCall methodCall) async { - log.add(methodCall); - return "Android 5.1.1"; + FlutterInappPurchase.channel + .setMockMethodCallHandler((MethodCall methodCall) async { + log.add(methodCall); + return "ready"; + }); + }); + test('invokes correct method', () async { + await FlutterInappPurchase.instance.showInAppMessageAndroid(); + expect(log, [ + isMethodCall('showInAppMessages', arguments: null), + ]); }); - }); - - tearDown(() { - FlutterInappPurchase.channel.setMethodCallHandler(null); - }); - test('invokes correct method', () async { - await FlutterInappPurchase.instance.platformVersion; - expect(log, [ - isMethodCall( - 'getPlatformVersion', - arguments: null, - ), - ]); - }); + test('returns correct result', () async { + final result = await FlutterInappPurchase.instance.showInAppMessageAndroid(); + expect(result, "ready"); + }); - test('returns correct result', () async { - expect(await FlutterInappPurchase.instance.platformVersion, - "Android 5.1.1"); + tearDown(() { + FlutterInappPurchase.channel.setMethodCallHandler(null); + }); }); }); - group('consumeAllItems', () { group('for Android', () { final List log = []; @@ -201,9 +197,8 @@ void main() { await FlutterInappPurchase.instance.getProducts(skus); expect(log, [ isMethodCall( - 'getItemsByType', + 'getProducts', arguments: { - 'type': 'inapp', 'skus': skus, }, ), @@ -386,9 +381,8 @@ void main() { await FlutterInappPurchase.instance.getSubscriptions(skus); expect(log, [ isMethodCall( - 'getItemsByType', + 'getSubscriptions', arguments: { - 'type': 'subs', 'skus': skus, }, ), From 129735fe8cc5e98485cbde4d7d39de46c8ce00cc Mon Sep 17 00:00:00 2001 From: Marian Date: Sat, 21 May 2022 19:16:59 +0200 Subject: [PATCH 05/13] fix format --- test/flutter_inapp_purchase_test.dart | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/flutter_inapp_purchase_test.dart b/test/flutter_inapp_purchase_test.dart index 7ac54101..0a5065f3 100644 --- a/test/flutter_inapp_purchase_test.dart +++ b/test/flutter_inapp_purchase_test.dart @@ -13,7 +13,7 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); group('FlutterInappPurchase', () { - group('showInAppMessageAndroid', (){ + group('showInAppMessageAndroid', () { group('for Android', () { final List log = []; setUp(() { @@ -33,14 +33,15 @@ void main() { ]); }); - test('returns correct result', () async { - final result = await FlutterInappPurchase.instance.showInAppMessageAndroid(); - expect(result, "ready"); - }); - tearDown(() { FlutterInappPurchase.channel.setMethodCallHandler(null); }); + + test('returns correct result', () async { + final result = + await FlutterInappPurchase.instance.showInAppMessageAndroid(); + expect(result, "ready"); + }); }); }); group('consumeAllItems', () { From 84f6effd6c175535d7461906bb657d0ef9ab44b2 Mon Sep 17 00:00:00 2001 From: Marian Date: Sat, 21 May 2022 19:29:07 +0200 Subject: [PATCH 06/13] fix format and update test --- .../AmazonInappPurchasePlugin.kt | 2 +- lib/flutter_inapp_purchase.dart | 2 +- test/flutter_inapp_purchase_test.dart | 43 +++++++++---------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt index 614c8aef..b6af3f86 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt @@ -52,7 +52,7 @@ class AmazonInappPurchasePlugin : MethodCallHandler { safeResult!!.success("Billing client has ended.") } "showInAppMessages" -> { - //not supported on amazon + safeChannel.success("in app messages not supported for amazon") } "consumeAllItems" -> { // consumable is a separate type in amazon diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index f2d30009..dd14547c 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -197,7 +197,7 @@ class FlutterInappPurchase { /// Android only, Google Play will show users messaging during grace period /// and account hold once per day and provide them an opportunity to fix their /// payment without leaving the app - Future showInAppMessageAndroid()async { + Future showInAppMessageAndroid() async { if (!_platform.isAndroid) return Future.value(""); _onInAppMessageController ??= StreamController.broadcast(); return await _channel.invokeMethod('showInAppMessages'); diff --git a/test/flutter_inapp_purchase_test.dart b/test/flutter_inapp_purchase_test.dart index 0a5065f3..08f3b6e6 100644 --- a/test/flutter_inapp_purchase_test.dart +++ b/test/flutter_inapp_purchase_test.dart @@ -1,4 +1,3 @@ -import 'dart:async'; import 'dart:convert'; import 'package:flutter/services.dart'; @@ -63,14 +62,14 @@ void main() { }); test('invokes correct method', () async { - await FlutterInappPurchase.instance.consumeAllItems; + await FlutterInappPurchase.instance.consumeAll(); expect(log, [ isMethodCall('consumeAllItems', arguments: null), ]); }); test('returns correct result', () async { - expect(await FlutterInappPurchase.instance.consumeAllItems, + expect(await FlutterInappPurchase.instance.consumeAll(), "All items have been consumed"); }); }); @@ -86,7 +85,7 @@ void main() { }); test('returns correct result', () async { - expect(await FlutterInappPurchase.instance.consumeAllItems, + expect(await FlutterInappPurchase.instance.consumeAll(), "no-ops in ios"); }); }); @@ -111,14 +110,14 @@ void main() { }); test('invokes correct method', () async { - await FlutterInappPurchase.instance.initConnection; + await FlutterInappPurchase.instance.initialize(); expect(log, [ isMethodCall('initConnection', arguments: null), ]); }); test('returns correct result', () async { - expect(await FlutterInappPurchase.instance.initConnection, + expect(await FlutterInappPurchase.instance.initialize(), "Billing client ready"); }); }); @@ -141,14 +140,14 @@ void main() { }); test('invokes correct method', () async { - await FlutterInappPurchase.instance.initConnection; + await FlutterInappPurchase.instance.initialize(); expect(log, [ isMethodCall('canMakePayments', arguments: null), ]); }); test('returns correct result', () async { - expect(await FlutterInappPurchase.instance.initConnection, "true"); + expect(await FlutterInappPurchase.instance.initialize(), "true"); }); }); }); @@ -589,9 +588,8 @@ void main() { }); test('returns correct result', () async { - List? actualList = await (FlutterInappPurchase.instance - .getPurchaseHistory() as FutureOr?>) ?? - []; + List? actualList = + await (FlutterInappPurchase.instance.getPurchaseHistory()) ?? []; List expectList = ((json.decode(resultInapp) as List) + (json.decode(resultSubs) as List)) .map((item) => PurchasedItem.fromJSON(item)) @@ -675,9 +673,8 @@ void main() { }); test('returns correct result', () async { - List? actualList = await (FlutterInappPurchase.instance - .getPurchaseHistory() as FutureOr?>) ?? - []; + List? actualList = + await (FlutterInappPurchase.instance.getPurchaseHistory()) ?? []; List? expectList = result .map((item) => PurchasedItem.fromJSON(item)) .toList(); @@ -772,9 +769,9 @@ void main() { }); test('returns correct result', () async { - List? actualList = await (FlutterInappPurchase.instance - .getAvailablePurchases() as FutureOr?>) ?? - []; + List? actualList = + await (FlutterInappPurchase.instance.getAvailablePurchases()) ?? + []; List expectList = ((json.decode(resultInapp) as List) + (json.decode(resultSubs) as List)) .map((item) => PurchasedItem.fromJSON(item)) @@ -858,9 +855,9 @@ void main() { }); test('returns correct result', () async { - List? actualList = await (FlutterInappPurchase.instance - .getAvailablePurchases() as FutureOr?>) ?? - []; + List? actualList = + await (FlutterInappPurchase.instance.getAvailablePurchases()) ?? + []; List? expectList = result .map((item) => PurchasedItem.fromJSON(item as Map)) @@ -1213,14 +1210,14 @@ void main() { }); test('invokes correct method', () async { - await FlutterInappPurchase.instance.endConnection; + await FlutterInappPurchase.instance.finalize(); expect(log, [ isMethodCall('endConnection', arguments: null), ]); }); test('returns correct result', () async { - expect(await FlutterInappPurchase.instance.endConnection, + expect(await FlutterInappPurchase.instance.finalize(), "Billing client has ended."); }); }); @@ -1236,7 +1233,7 @@ void main() { }); test('returns correct result', () async { - expect(await FlutterInappPurchase.instance.endConnection, + expect(await FlutterInappPurchase.instance.finalize(), "Billing client has ended."); }); }); From 4f94c775d05b5bb1c926d6d45cc22ca6dcf6c3dc Mon Sep 17 00:00:00 2001 From: Marian Date: Sun, 22 May 2022 10:15:45 +0200 Subject: [PATCH 07/13] bug fix --- .../dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt index b6af3f86..a068f742 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt @@ -52,7 +52,7 @@ class AmazonInappPurchasePlugin : MethodCallHandler { safeResult!!.success("Billing client has ended.") } "showInAppMessages" -> { - safeChannel.success("in app messages not supported for amazon") + safeResult.success("in app messages not supported for amazon") } "consumeAllItems" -> { // consumable is a separate type in amazon From 92d8f6e2f7c2c6df8b273159aafbbfc0b35e731e Mon Sep 17 00:00:00 2001 From: Marian Date: Sun, 22 May 2022 10:26:29 +0200 Subject: [PATCH 08/13] add missing cast --- .../dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt index a068f742..bff0498e 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt @@ -52,7 +52,7 @@ class AmazonInappPurchasePlugin : MethodCallHandler { safeResult!!.success("Billing client has ended.") } "showInAppMessages" -> { - safeResult.success("in app messages not supported for amazon") + safeResult!!.success("in app messages not supported for amazon") } "consumeAllItems" -> { // consumable is a separate type in amazon From 6332c021d7972697bf1e8f2f536c032771c8b4ef Mon Sep 17 00:00:00 2001 From: Marian Date: Mon, 23 May 2022 16:47:41 +0200 Subject: [PATCH 09/13] add new features --- .../AmazonInappPurchasePlugin.kt | 9 +++ .../AndroidInappPurchasePlugin.kt | 61 +++++++++++++++- .../FlutterInappPurchasePlugin.kt | 5 ++ example/lib/main.dart | 15 ++-- lib/Store.dart | 6 ++ lib/flutter_inapp_purchase.dart | 71 ++++++++++++------- 6 files changed, 130 insertions(+), 37 deletions(-) create mode 100644 lib/Store.dart diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt index bff0498e..47638bb5 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AmazonInappPurchasePlugin.kt @@ -33,7 +33,13 @@ class AmazonInappPurchasePlugin : MethodCallHandler { } override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { + if(call.method == "getStore"){ + result.success(FlutterInappPurchasePlugin.getStore()) + return + } + safeResult = MethodResultWrapper(result, channel!!) + try { PurchasingService.registerListener(context, purchasesUpdatedListener) } catch (e: Exception) { @@ -51,6 +57,9 @@ class AmazonInappPurchasePlugin : MethodCallHandler { "endConnection" -> { safeResult!!.success("Billing client has ended.") } + "isReady" -> { + safeResult!!.success(true) + } "showInAppMessages" -> { safeResult!!.success("in app messages not supported for amazon") } diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt index eafad8bf..40f530c7 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt @@ -3,7 +3,10 @@ package com.dooboolab.flutterinapppurchase import android.app.Activity import android.app.Application import android.app.Application.ActivityLifecycleCallbacks +import android.content.ActivityNotFoundException import android.content.Context +import android.content.Intent +import android.net.Uri import android.os.Bundle import android.util.Log import com.android.billingclient.api.* @@ -22,6 +25,7 @@ import org.json.JSONObject class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, ActivityLifecycleCallbacks { private val TAG = "InappPurchasePlugin" + private val playStoreUrl = "https://play.google.com/store/account/subscriptions" private var safeResult: MethodResultWrapper? = null private var billingClient: BillingClient? = null private var context: Context? = null @@ -52,8 +56,25 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, override fun onActivityStopped(activity: Activity) {} override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { + + if(call.method == "getStore"){ + result.success(FlutterInappPurchasePlugin.getStore()) + return + } + + if(call.method == "manageSubscription"){ + result.success(manageSubscription(call.argument("sku")!!,call.argument("packageName")!!)) + return + } + + if(call.method == "openPlayStoreSubscriptions"){ + result.success(openPlayStoreSubscriptions()) + return + } + safeResult = MethodResultWrapper(result, channel!!) val safeChannel = MethodResultWrapper(result, channel!!) + if (call.method == "initConnection") { if (billingClient != null) { safeChannel.success("Already started. Call endConnection method if you want to start over.") @@ -101,7 +122,9 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, } }) return - } else if (call.method == "endConnection") { + } + + if (call.method == "endConnection") { if (billingClient == null) { safeChannel.success("Already ended.") }else{ @@ -110,7 +133,14 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, return } - if (billingClient == null || !billingClient!!.isReady) { + val isReady = billingClient?.isReady + + if(call.method == "isReady"){ + safeChannel.success(isReady) + return + } + + if (isReady != true) { safeChannel.error( call.method, BillingError.E_NOT_PREPARED, @@ -133,6 +163,33 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, } } + + private fun manageSubscription(sku: String, packageName: String): Boolean{ + val url = "$playStoreUrl?sku=${sku}&package=${packageName}" + return openWithFallback(Uri.parse(url)) + } + + private fun openPlayStoreSubscriptions():Boolean{ + return openWithFallback(Uri.parse(playStoreUrl)) + } + + private fun openWithFallback(uri: Uri):Boolean{ + try{ + activity!!.startActivity(Intent(Intent.ACTION_VIEW).apply { data = uri }) + return true + }catch (e: ActivityNotFoundException){ + try{ + activity!!.startActivity( Intent(Intent.ACTION_VIEW) + .setDataAndType(uri, "text/html") + .addCategory(Intent.CATEGORY_BROWSABLE)) + return true + }catch (e: ActivityNotFoundException){ + // ignore + } + } + return false + } + private fun showInAppMessages(safeChannel: MethodResultWrapper) { val inAppMessageParams = InAppMessageParams.newBuilder() .addInAppMessageCategoryToShow(InAppMessageParams.InAppMessageCategoryId.TRANSACTIONAL) diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.kt index ebbb32ac..a9ad21b3 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/FlutterInappPurchasePlugin.kt @@ -92,6 +92,11 @@ class FlutterInappPurchasePlugin : FlutterPlugin, ActivityAware { companion object { private var isAndroid = false private var isAmazon = false + + fun getStore(): String { + return if (!isAndroid && !isAmazon) "none" else if (isAndroid) "play_store" else "amazon" + } + fun registerWith(registrar: Registrar) { val instance = FlutterInappPurchasePlugin() instance.onAttached(registrar.context(), registrar.messenger()) diff --git a/example/lib/main.dart b/example/lib/main.dart index 42ff8288..d176780b 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'dart:async'; import 'dart:io'; -import 'package:flutter/services.dart'; import 'package:flutter_inapp_purchase/flutter_inapp_purchase.dart'; void main() => runApp(new MyApp()); @@ -62,14 +61,10 @@ class _InAppState extends State { Future initPlatformState() async { String platformVersion; // Platform messages may fail, so we use a try/catch PlatformException. - try { - platformVersion = await FlutterInappPurchase.instance.platformVersion; - } on PlatformException { - platformVersion = 'Failed to get platform version.'; - } + // prepare - var result = await FlutterInappPurchase.instance.initConnection; + var result = await FlutterInappPurchase.instance.initialize(); print('result: $result'); // If the widget was removed from the tree while the asynchronous platform @@ -83,7 +78,7 @@ class _InAppState extends State { // refresh items for android try { - String msg = await FlutterInappPurchase.instance.consumeAllItems; + String msg = await FlutterInappPurchase.instance.consumeAll(); print('consumeAllItems: $msg'); } catch (err) { print('consumeAllItems error: $err'); @@ -254,7 +249,7 @@ class _InAppState extends State { padding: EdgeInsets.all(0.0), onPressed: () async { print("---------- Connect Billing Button Pressed"); - await FlutterInappPurchase.instance.initConnection; + await FlutterInappPurchase.instance.initialize(); }, child: Container( padding: EdgeInsets.symmetric(horizontal: 20.0), @@ -277,7 +272,7 @@ class _InAppState extends State { padding: EdgeInsets.all(0.0), onPressed: () async { print("---------- End Connection Button Pressed"); - await FlutterInappPurchase.instance.endConnection; + await FlutterInappPurchase.instance.finalize(); if (_purchaseUpdatedSubscription != null) { _purchaseUpdatedSubscription.cancel(); _purchaseUpdatedSubscription = null; diff --git a/lib/Store.dart b/lib/Store.dart new file mode 100644 index 00000000..b3665e66 --- /dev/null +++ b/lib/Store.dart @@ -0,0 +1,6 @@ +enum Store{ + none, + playStore, + amazon, + appStore +} \ No newline at end of file diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index dd14547c..d5cd0e0f 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -6,6 +6,7 @@ import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; import 'package:platform/platform.dart'; +import 'Store.dart'; import 'modules.dart'; import 'utils.dart'; @@ -65,18 +66,6 @@ class FlutterInappPurchase { : _pf = platform, _httpClient = client ?? http.Client(); - /// Returns the platform version on `Android` and `iOS`. - /// - /// eg, `Android 5.1.1` - Future get platformVersion async => - await _channel.invokeMethod('getPlatformVersion'); - - /// Consumes all items on `Android`. - /// - /// Particularly useful for removing all consumable items. - @Deprecated('Use consumeAll() instead.') - Future get consumeAllItems async => consumeAll(); - /// Consumes all items on `Android`. /// /// Particularly useful for removing all consumable items. @@ -90,13 +79,6 @@ class FlutterInappPurchase { code: _platform.operatingSystem, message: "platform not supported"); } - /// InitConnection prepare iap features for both `Android` and `iOS`. - /// - /// This must be called on `Android` and `iOS` before purchasing. - /// On `iOS`, it also checks if the client can make payments. - @Deprecated('Use initialize() instead.') - Future get initConnection async => initialize(); - /// Initializes iap features for both `Android` and `iOS`. /// /// This must be called on `Android` and `iOS` before purchasing. @@ -112,6 +94,51 @@ class FlutterInappPurchase { throw PlatformException( code: _platform.operatingSystem, message: "platform not supported"); } + + Future isReady()async { + if (_platform.isAndroid) { + return (await _channel.invokeMethod('isReady')) ?? false; + } + if (_platform.isIOS) { + return Future.value(true); + } + throw PlatformException( + code: _platform.operatingSystem, message: "platform not supported"); + } + + Future manageSubscription(String sku, String packageName)async{ + if (_platform.isAndroid) { + return (await _channel.invokeMethod('manageSubscription', + { + 'sku': sku, + 'packageName': packageName, + },)) ?? false; + } + throw PlatformException( + code: _platform.operatingSystem, message: "platform not supported"); + } + + Future openPlayStoreSubscriptions()async{ + if (_platform.isAndroid) { + return (await _channel.invokeMethod('manageSubscription')) ?? false; + } + throw PlatformException( + code: _platform.operatingSystem, message: "platform not supported"); + } + + Future getStore()async { + if(_platform.isIOS){ + return Future.value(Store.appStore); + } + if(_platform.isAndroid){ + final store = await _channel.invokeMethod('getStore'); + if(store == "play_store")return Store.playStore; + if(store == "amazon")return Store.amazon; + return Store.none; + } + return Future.value(Store.none); + } + /// Retrieves a list of products from the store on `Android` and `iOS`. /// @@ -411,12 +438,6 @@ class FlutterInappPurchase { code: _platform.operatingSystem, message: "platform not supported"); } - /// End Play Store connection on `Android` and remove iap observer in `iOS`. - /// - /// Absolutely necessary to call this when done with the payment. - @Deprecated('Use finalize() instead.') - Future get endConnection async => finalize(); - /// End Play Store connection on `Android` and remove iap observer in `iOS`. /// /// Absolutely necessary to call this when done with the payment. From 357842727a1ad480b49e9eff102acb958aefc54e Mon Sep 17 00:00:00 2001 From: Marian Date: Mon, 23 May 2022 17:36:01 +0200 Subject: [PATCH 10/13] bug fixes --- .../AndroidInappPurchasePlugin.kt | 18 ++++----- lib/Store.dart | 7 +--- lib/flutter_inapp_purchase.dart | 38 +++++++++---------- test/flutter_inapp_purchase_test.dart | 14 ++++--- 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt index 40f530c7..c6e928ef 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt @@ -18,14 +18,14 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler import org.json.JSONArray import org.json.JSONException import org.json.JSONObject +import java.security.InvalidParameterException /** * AndroidInappPurchasePlugin */ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, ActivityLifecycleCallbacks { - private val TAG = "InappPurchasePlugin" - private val playStoreUrl = "https://play.google.com/store/account/subscriptions" + private var safeResult: MethodResultWrapper? = null private var billingClient: BillingClient? = null private var context: Context? = null @@ -163,14 +163,13 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, } } - private fun manageSubscription(sku: String, packageName: String): Boolean{ - val url = "$playStoreUrl?sku=${sku}&package=${packageName}" + val url = "$PLAY_STORE_URL?sku=${sku}&package=${packageName}" return openWithFallback(Uri.parse(url)) } private fun openPlayStoreSubscriptions():Boolean{ - return openWithFallback(Uri.parse(playStoreUrl)) + return openWithFallback(Uri.parse(PLAY_STORE_URL)) } private fun openWithFallback(uri: Uri):Boolean{ @@ -453,7 +452,6 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, val obfuscatedAccountId = call.argument("obfuscatedAccountId") val obfuscatedProfileId = call.argument("obfuscatedProfileId") val sku = call.argument("sku") - val oldSku = call.argument("oldSku") val prorationMode = call.argument("prorationMode")!! val purchaseToken = call.argument("purchaseToken") val builder = newBuilder() @@ -475,9 +473,8 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, val params = SubscriptionUpdateParams.newBuilder() if (purchaseToken != null) { params.setOldSkuPurchaseToken(purchaseToken) - } - if (oldSku != null) { - params.setOldSkuPurchaseToken(oldSku) + }else if(prorationMode != -1){ + throw InvalidParameterException("purchaseToken not defined") } if (obfuscatedAccountId != null) { builder.setObfuscatedAccountId(obfuscatedAccountId) @@ -506,6 +503,7 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, params.setReplaceSkusProrationMode(prorationMode) else -> params.setReplaceSkusProrationMode(ProrationMode.UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY) } + if (purchaseToken != null) { builder.setSubscriptionUpdateParams(params.build()) } @@ -576,6 +574,8 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, } companion object { + private const val TAG = "InappPurchasePlugin" + private const val PLAY_STORE_URL = "https://play.google.com/store/account/subscriptions" private var skus: ArrayList = arrayListOf() } } \ No newline at end of file diff --git a/lib/Store.dart b/lib/Store.dart index b3665e66..79519a80 100644 --- a/lib/Store.dart +++ b/lib/Store.dart @@ -1,6 +1 @@ -enum Store{ - none, - playStore, - amazon, - appStore -} \ No newline at end of file +enum Store { none, playStore, amazon, appStore } diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index d5cd0e0f..f0f89043 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -94,8 +94,8 @@ class FlutterInappPurchase { throw PlatformException( code: _platform.operatingSystem, message: "platform not supported"); } - - Future isReady()async { + + Future isReady() async { if (_platform.isAndroid) { return (await _channel.invokeMethod('isReady')) ?? false; } @@ -106,40 +106,43 @@ class FlutterInappPurchase { code: _platform.operatingSystem, message: "platform not supported"); } - Future manageSubscription(String sku, String packageName)async{ + Future manageSubscription(String sku, String packageName) async { if (_platform.isAndroid) { - return (await _channel.invokeMethod('manageSubscription', - { - 'sku': sku, - 'packageName': packageName, - },)) ?? false; + return (await _channel.invokeMethod( + 'manageSubscription', + { + 'sku': sku, + 'packageName': packageName, + }, + )) ?? + false; } throw PlatformException( code: _platform.operatingSystem, message: "platform not supported"); } - Future openPlayStoreSubscriptions()async{ + Future openPlayStoreSubscriptions() async { if (_platform.isAndroid) { - return (await _channel.invokeMethod('manageSubscription')) ?? false; + return (await _channel.invokeMethod('openPlayStoreSubscriptions')) ?? + false; } throw PlatformException( code: _platform.operatingSystem, message: "platform not supported"); } - Future getStore()async { - if(_platform.isIOS){ + Future getStore() async { + if (_platform.isIOS) { return Future.value(Store.appStore); } - if(_platform.isAndroid){ + if (_platform.isAndroid) { final store = await _channel.invokeMethod('getStore'); - if(store == "play_store")return Store.playStore; - if(store == "amazon")return Store.amazon; + if (store == "play_store") return Store.playStore; + if (store == "amazon") return Store.amazon; return Store.none; } return Future.value(Store.none); } - /// Retrieves a list of products from the store on `Android` and `iOS`. /// /// `iOS` also returns subscriptions. @@ -273,7 +276,6 @@ class FlutterInappPurchase { return await _channel.invokeMethod('buyItemByType', { 'type': describeEnum(_TypeInApp.inapp), 'sku': sku, - 'oldSku': null, 'prorationMode': -1, 'obfuscatedAccountId': obfuscatedAccountId, 'obfuscatedProfileId': obfuscatedProfileIdAndroid, @@ -298,7 +300,6 @@ class FlutterInappPurchase { /// Identical to [requestPurchase] on `iOS`. Future requestSubscription( String sku, { - String? oldSkuAndroid, int? prorationModeAndroid, String? obfuscatedAccountIdAndroid, String? obfuscatedProfileIdAndroid, @@ -308,7 +309,6 @@ class FlutterInappPurchase { return await _channel.invokeMethod('buyItemByType', { 'type': describeEnum(_TypeInApp.subs), 'sku': sku, - 'oldSku': oldSkuAndroid, 'prorationMode': prorationModeAndroid ?? -1, 'obfuscatedAccountId': obfuscatedAccountIdAndroid, 'obfuscatedProfileId': obfuscatedProfileIdAndroid, diff --git a/test/flutter_inapp_purchase_test.dart b/test/flutter_inapp_purchase_test.dart index 08f3b6e6..1f687d8e 100644 --- a/test/flutter_inapp_purchase_test.dart +++ b/test/flutter_inapp_purchase_test.dart @@ -887,6 +887,7 @@ void main() { group('requestPurchase', () { group('for iOS', () { final List log = []; + /* final dynamic result = { "transactionDate": "1552824902000", "transactionId": "testTransactionId", @@ -900,6 +901,7 @@ void main() { "originalTransactionIdentifierIOS": "testOriginalTransactionIdentifierIOS" }; + */ final String sku = "testsku"; final String forUser = "testObfuscatedUser"; @@ -944,6 +946,7 @@ void main() { group('for Android', () { final List log = []; final String sku = "testsku"; + /* final dynamic result = { "transactionDate": "1552824902000", "transactionId": "testTransactionId", @@ -957,6 +960,7 @@ void main() { "originalTransactionIdentifierIOS": "testOriginalTransactionIdentifierIOS" }; + */ setUp(() { FlutterInappPurchase(FlutterInappPurchase.private( @@ -981,7 +985,6 @@ void main() { arguments: { 'type': 'inapp', 'sku': sku, - 'oldSku': null, 'prorationMode': -1, 'obfuscatedAccountId': null, 'obfuscatedProfileId': null, @@ -1003,7 +1006,7 @@ void main() { final List log = []; final String sku = "testsku"; - final String oldSku = "testOldSku"; + /* final String result = """{ "transactionDate":"1552824902000", "transactionId":"testTransactionId", @@ -1016,6 +1019,7 @@ void main() { "originalTransactionDateIOS":"1552831136000", "originalTransactionIdentifierIOS":"testOriginalTransactionIdentifierIOS" }"""; + */ setUp(() { FlutterInappPurchase(FlutterInappPurchase.private( @@ -1033,15 +1037,13 @@ void main() { }); test('invokes correct method', () async { - await FlutterInappPurchase.instance - .requestSubscription(sku, oldSkuAndroid: oldSku); + await FlutterInappPurchase.instance.requestSubscription(sku); expect(log, [ isMethodCall( 'buyItemByType', arguments: { 'type': 'subs', 'sku': sku, - 'oldSku': oldSku, 'prorationMode': -1, 'obfuscatedAccountId': null, 'obfuscatedProfileId': null, @@ -1061,6 +1063,7 @@ void main() { final List log = []; final String sku = "testsku"; final String forUser = "testObfuscatedUser"; + /* final dynamic result = { "transactionDate": "1552824902000", "transactionId": "testTransactionId", @@ -1074,6 +1077,7 @@ void main() { "originalTransactionIdentifierIOS": "testOriginalTransactionIdentifierIOS" }; + */ setUp(() { FlutterInappPurchase(FlutterInappPurchase.private( From b80a878639a66c1b90755ae04ba0c49a79b94c67 Mon Sep 17 00:00:00 2001 From: Marian Date: Mon, 23 May 2022 17:53:38 +0200 Subject: [PATCH 11/13] remove property check --- .../flutterinapppurchase/AndroidInappPurchasePlugin.kt | 2 -- lib/flutter_inapp_purchase.dart | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt index c6e928ef..1fdb7293 100644 --- a/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt +++ b/android/src/main/kotlin/com/dooboolab/flutterinapppurchase/AndroidInappPurchasePlugin.kt @@ -473,8 +473,6 @@ class AndroidInappPurchasePlugin internal constructor() : MethodCallHandler, val params = SubscriptionUpdateParams.newBuilder() if (purchaseToken != null) { params.setOldSkuPurchaseToken(purchaseToken) - }else if(prorationMode != -1){ - throw InvalidParameterException("purchaseToken not defined") } if (obfuscatedAccountId != null) { builder.setObfuscatedAccountId(obfuscatedAccountId) diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index f0f89043..fedfb1c5 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -123,7 +123,8 @@ class FlutterInappPurchase { Future openPlayStoreSubscriptions() async { if (_platform.isAndroid) { - return (await _channel.invokeMethod('openPlayStoreSubscriptions')) ?? + return (await _channel + .invokeMethod('openPlayStoreSubscriptions')) ?? false; } throw PlatformException( From ba97859bdd9a4558d0417ce9a2eaf3f488c60193 Mon Sep 17 00:00:00 2001 From: Marian Date: Mon, 23 May 2022 18:33:38 +0200 Subject: [PATCH 12/13] fix format issue --- example/lib/main.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index d176780b..53e52cd6 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -62,7 +62,6 @@ class _InAppState extends State { String platformVersion; // Platform messages may fail, so we use a try/catch PlatformException. - // prepare var result = await FlutterInappPurchase.instance.initialize(); print('result: $result'); From e2c41a08d978b76bb49ef3450493d5b8a41563bd Mon Sep 17 00:00:00 2001 From: Marian Date: Mon, 23 May 2022 19:47:25 +0200 Subject: [PATCH 13/13] add new proration mode --- lib/flutter_inapp_purchase.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/flutter_inapp_purchase.dart b/lib/flutter_inapp_purchase.dart index fedfb1c5..49a31785 100644 --- a/lib/flutter_inapp_purchase.dart +++ b/lib/flutter_inapp_purchase.dart @@ -687,6 +687,10 @@ class FlutterInappPurchase { /// A list of valid values for ProrationMode parameter /// https://developer.android.com/reference/com/android/billingclient/api/BillingFlowParams.ProrationMode class AndroidProrationMode { + /// Replacement takes effect immediately, and the user is charged full price of new plan and is given a full billing cycle of subscription, plus remaining prorated time from the old plan. + /// https://developer.android.com/reference/com/android/billingclient/api/BillingFlowParams.ProrationMode#IMMEDIATE_AND_CHARGE_FULL_PRICE + static const int IMMEDIATE_AND_CHARGE_FULL_PRICE = 5; + /// Replacement takes effect when the old plan expires, and the new price will be charged at the same time. /// https://developer.android.com/reference/com/android/billingclient/api/BillingFlowParams.ProrationMode#DEFERRED static const int DEFERRED = 4;