Release 2.0.0 (#64)

* Update poolakey version to 2.0.0

* refactor runOnCommunicator fun (#60)

* Refactor getting payment result (#63)

* Update fragment and appcompat version

* Increase compileSdkVersion to 31

Author: msmoradi

app/src/main/java/ir/cafebazaar/poolakeysample/MainActivity.kt

@@ -1,6 +1,5 @@
 package ir.cafebazaar.poolakeysample
 
-import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.annotation.StringRes
@@ -49,8 +48,7 @@ class MainActivity : AppCompatActivity() {
             if (paymentConnection.getState() == ConnectionState.Connected) {
                 purchaseProduct(
                     productId = skuValueInput.text.toString(),
-                    requestCode = PURCHASE_REQUEST_CODE,
-                    payload = "payload",
+                    payload = "purchasePayload",
                     dynamicPriceToken = dynamicPriceToken.text.toString()
                 )
             }
@@ -59,8 +57,7 @@ class MainActivity : AppCompatActivity() {
             if (paymentConnection.getState() == ConnectionState.Connected) {
                 subscribeProduct(
                     productId = skuValueInput.text.toString(),
-                    requestCode = SUBSCRIBE_REQUEST_CODE,
-                    payload = "",
+                    payload = "subscribePayload",
                     dynamicPriceToken = dynamicPriceToken.text.toString()
                 )
             }
@@ -83,18 +80,17 @@ class MainActivity : AppCompatActivity() {
 
     private fun subscribeProduct(
         productId: String,
-        requestCode: Int,
         payload: String,
         dynamicPriceToken: String?
     ) {
+        val purchaseRequest = PurchaseRequest(
+            productId = skuValueInput.text.toString(),
+            payload = payload,
+            dynamicPriceToken = dynamicPriceToken
+        )
         payment.subscribeProduct(
-            activity = this@MainActivity,
-            request = PurchaseRequest(
-                productId = skuValueInput.text.toString(),
-                requestCode = SUBSCRIBE_REQUEST_CODE,
-                payload = "",
-                dynamicPriceToken = dynamicPriceToken
-            )
+            registry = activityResultRegistry,
+            request = purchaseRequest
         ) {
             purchaseFlowBegan {
                 toast(R.string.general_purchase_flow_began_message)
@@ -103,25 +99,35 @@ class MainActivity : AppCompatActivity() {
                 // bazaar need to update, in this case we only launch purchase without discount
                 if (it is DynamicPriceNotSupportedException) {
                     toast(R.string.general_purchase_failed_dynamic_price_token_message)
-                    subscribeProduct(productId, requestCode, payload, null)
+                    subscribeProduct(productId, payload, null)
                 } else {
                     toast(R.string.general_purchase_failed_message)
                 }
             }
+            purchaseSucceed {
+                toast(R.string.general_purchase_succeed_message)
+                if (consumeSwitch.isChecked) {
+                    consumePurchasedItem(it.purchaseToken)
+                }
+            }
+            purchaseCanceled {
+                toast(R.string.general_purchase_cancelled_message)
+            }
+            purchaseFailed {
+                toast(R.string.general_purchase_failed_message)
+            }
         }
     }
 
     private fun purchaseProduct(
         productId: String,
-        requestCode: Int,
         payload: String,
         dynamicPriceToken: String?
     ) {
         payment.purchaseProduct(
-            activity = this,
+            registry = activityResultRegistry,
             request = PurchaseRequest(
                 productId = productId,
-                requestCode = requestCode,
                 payload = payload,
                 dynamicPriceToken = dynamicPriceToken
             )
@@ -133,11 +139,23 @@ class MainActivity : AppCompatActivity() {
                 // bazaar need to update, in this case we only launch purchase without discount
                 if (it is DynamicPriceNotSupportedException) {
                     toast(R.string.general_purchase_failed_dynamic_price_token_message)
-                    purchaseProduct(productId, requestCode, payload, null)
+                    purchaseProduct(productId, payload, null)
                 } else {
                     toast(R.string.general_purchase_failed_message)
                 }
             }
+            purchaseSucceed {
+                toast(R.string.general_purchase_succeed_message)
+                if (consumeSwitch.isChecked) {
+                    consumePurchasedItem(it.purchaseToken)
+                }
+            }
+            purchaseCanceled {
+                toast(R.string.general_purchase_cancelled_message)
+            }
+            purchaseFailed {
+                toast(R.string.general_purchase_failed_message)
+            }
         }
     }
 
@@ -221,24 +239,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        payment.onActivityResult(requestCode, resultCode, data) {
-            purchaseSucceed {
-                toast(R.string.general_purchase_succeed_message)
-                if (consumeSwitch.isChecked) {
-                    consumePurchasedItem(it.purchaseToken)
-                }
-            }
-            purchaseCanceled {
-                toast(R.string.general_purchase_cancelled_message)
-            }
-            purchaseFailed {
-                toast(R.string.general_purchase_failed_message)
-            }
-        }
-    }
-
     private fun consumePurchasedItem(purchaseToken: String) {
         payment.consumeProduct(purchaseToken) {
             consumeSucceed {
@@ -262,10 +262,4 @@ class MainActivity : AppCompatActivity() {
         paymentConnection.disconnect()
         super.onDestroy()
     }
-
-    companion object {
-
-        private const val PURCHASE_REQUEST_CODE = 1000
-        private const val SUBSCRIBE_REQUEST_CODE = 1001
-    }
 }

poolakey-rx/src/main/java/ir/cafebazaar/poolakey/rx/PaymentRx.kt

@@ -1,8 +1,6 @@
 package ir.cafebazaar.poolakey.rx
 
-import android.app.Activity
-import android.content.Intent
-import androidx.fragment.app.Fragment
+import androidx.activity.result.ActivityResultRegistry
 import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.Single
@@ -12,7 +10,6 @@ import ir.cafebazaar.poolakey.entity.PurchaseInfo
 import ir.cafebazaar.poolakey.entity.SkuDetails
 import ir.cafebazaar.poolakey.entity.TrialSubscriptionInfo
 import ir.cafebazaar.poolakey.request.PurchaseRequest
-import ir.cafebazaar.poolakey.rxbase.exception.PurchaseCanceledException
 
 /**
  * You have to use this function to connect to the In-App Billing service. Note that you have to
@@ -39,30 +36,16 @@ fun Payment.connect(): Observable<Connection> {
  * You can use this function to navigate user to Bazaar's payment activity to purchase a product.
  * Note that for subscribing a product you have to use the 'subscribeProduct' function.
  * @see subscribeProduct
- * @param activity We use this activity instance to actually start Bazaar's payment activity.
+ * @param registry We use this activityResultRegistry instance to actually start Bazaar's payment activity.
  * @param request This contains some information about the product that we are going to purchase.
  * @return Completable that you can subscribe to it and it gets completed when purchase flow begins.
  */
-fun Payment.purchaseProduct(activity: Activity, request: PurchaseRequest): Completable {
+fun Payment.purchaseProduct(
+    registry: ActivityResultRegistry,
+    request: PurchaseRequest
+): Completable {
     return Completable.create { emitter ->
-        purchaseProduct(activity, request) {
-            purchaseFlowBegan { emitter.onComplete() }
-            failedToBeginFlow { emitter.onError(it) }
-        }
-    }
-}
-
-/**
- * You can use this function to navigate user to Bazaar's payment activity to purchase a product.
- * Note that for subscribing a product you have to use the 'subscribeProduct' function.
- * @see subscribeProduct
- * @param fragment We use this fragment instance to actually start Bazaar's payment activity.
- * @param request This contains some information about the product that we are going to purchase.
- * @return Completable that you can subscribe to it and it gets completed when purchase flow begins.
- */
-fun Payment.purchaseProduct(fragment: Fragment, request: PurchaseRequest): Completable {
-    return Completable.create { emitter ->
-        purchaseProduct(fragment, request) {
+        purchaseProduct(registry, request) {
             purchaseFlowBegan { emitter.onComplete() }
             failedToBeginFlow { emitter.onError(it) }
         }
@@ -92,30 +75,16 @@ fun Payment.consumeProduct(purchaseToken: String): Completable {
  * You can use this function to navigate user to Bazaar's payment activity to subscribe a product.
  * Note that for purchasing a product you have to use the 'purchaseProduct' function.
  * @see purchaseProduct
- * @param activity We use this activity instance to actually start Bazaar's payment activity.
- * @param request This contains some information about the product that we are going to subscribe.
- * @return Completable that you can subscribe to it and it gets completed when purchase flow begins.
- */
-fun Payment.subscribeProduct(activity: Activity, request: PurchaseRequest): Completable {
-    return Completable.create { emitter ->
-        subscribeProduct(activity, request) {
-            purchaseFlowBegan { emitter.onComplete() }
-            failedToBeginFlow { emitter.onError(it) }
-        }
-    }
-}
-
-/**
- * You can use this function to navigate user to Bazaar's payment activity to subscribe a product.
- * Note that for purchasing a product you have to use the 'purchaseProduct' function.
- * @see purchaseProduct
- * @param fragment We use this fragment instance to actually start Bazaar's payment activity.
+ * @param registry We use this activityResultRegistry instance to actually start Bazaar's payment activity.
  * @param request This contains some information about the product that we are going to subscribe.
  * @return Completable that you can subscribe to it and it gets completed when purchase flow begins.
  */
-fun Payment.subscribeProduct(fragment: Fragment, request: PurchaseRequest): Completable {
+fun Payment.subscribeProduct(
+    registry: ActivityResultRegistry,
+    request: PurchaseRequest
+): Completable {
     return Completable.create { emitter ->
-        subscribeProduct(fragment, request) {
+        subscribeProduct(registry, request) {
             purchaseFlowBegan { emitter.onComplete() }
             failedToBeginFlow { emitter.onError(it) }
         }
@@ -199,30 +168,4 @@ fun Payment.checkTrialSubscription(): Single<TrialSubscriptionInfo> {
             checkTrialSubscriptionFailed { emitter.onError(it) }
         }
     }
-}
-
-/**
- * You have to use this function in order to check if user purchased or subscribed the product.
- * Note that even if the purchase was successful, it's highly recommended to double check the
- * purchase via Bazaar's REST API: http://developers.cafebazaar.ir/fa/docs/developer-api-v2-introduction/
- * @param requestCode This is the request code that you've used when constructing PurchaseRequest.
- * @see PurchaseRequest
- * @param resultCode When you override 'onActivityResult' function in your activity or fragment
- * you have access to this argument and it indicates if user canceled the purchase or not.
- * @param data When you override 'onActivityResult' function in your activity or fragment
- * you have access to this argument and it contains purchase data.
- * @return Single that you can subscribe to it and get notified about the purchase state.
- */
-fun Payment.onActivityResult(
-    requestCode: Int,
-    resultCode: Int,
-    data: Intent?
-): Single<PurchaseInfo> {
-    return Single.create { emitter ->
-        onActivityResult(requestCode, resultCode, data) {
-            purchaseSucceed { emitter.onSuccess(it) }
-            purchaseCanceled { emitter.onError(PurchaseCanceledException()) }
-            purchaseFailed { emitter.onError(it) }
-        }
-    }
-}
+}