Release 1.3.0 (#58)

* Add capability to check trial subscription

* Increase version to 1.3.0

Author: msmoradi

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

@@ -13,6 +13,7 @@ import ir.cafebazaar.poolakey.config.PaymentConfiguration
 import ir.cafebazaar.poolakey.config.SecurityCheck
 import ir.cafebazaar.poolakey.exception.DynamicPriceNotSupportedException
 import ir.cafebazaar.poolakey.request.PurchaseRequest
+import kotlinx.android.synthetic.main.activity_main.checkTrialSubscriptionButton
 import kotlinx.android.synthetic.main.activity_main.consumeSwitch
 import kotlinx.android.synthetic.main.activity_main.dynamicPriceToken
 import kotlinx.android.synthetic.main.activity_main.getSkuDetailInAppButton
@@ -74,6 +75,9 @@ class MainActivity : AppCompatActivity() {
                 payment.getSubscribedProducts(handlePurchaseQueryCallback())
             }
         }
+        checkTrialSubscriptionButton.setOnClickListener {
+            onCheckTrialSubscriptionClicked()
+        }
         setGetSkuDetailClickListener()
     }
 
@@ -163,6 +167,19 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun onCheckTrialSubscriptionClicked() {
+        if (paymentConnection.getState() == ConnectionState.Connected) {
+            payment.checkTrialSubscription {
+                checkTrialSubscriptionSucceed {
+                    toast(it.toString())
+                }
+                checkTrialSubscriptionFailed {
+                    it.message?.let { message -> toast(message) }
+                }
+            }
+        }
+    }
+
     private fun onGetSkuDetailInAppClicked() {
         if (paymentConnection.getState() == ConnectionState.Connected) {
             payment.getInAppSkuDetails(
@@ -247,8 +264,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     companion object {
+
         private const val PURCHASE_REQUEST_CODE = 1000
         private const val SUBSCRIBE_REQUEST_CODE = 1001
     }
-
 }

app/src/main/res/layout/activity_main.xml

@@ -77,5 +77,11 @@
             android:layout_height="wrap_content"
             android:text="@string/general_get_sku_detail_sub_text" />
 
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/checkTrialSubscriptionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/general_check_trial_subscription_text" />
+
     </LinearLayout>
 </ScrollView>

app/src/main/res/values/strings.xml

@@ -14,6 +14,7 @@
     <string name="general_query_subscription_text">Check if user subscribed this item</string>
     <string name="general_get_sku_detail_inapp_text">Get Sku detail of in-app item</string>
     <string name="general_get_sku_detail_sub_text">Get Sku detail of subscription item</string>
+    <string name="general_check_trial_subscription_text">Check Trial subscription</string>
 
     <string name="general_purchase_flow_began_message">Purchase flow began</string>
     <string name="general_purchase_succeed_message">Purchase succeed</string>
@@ -24,6 +25,7 @@
     <string name="general_consume_failed_message">Consume failed</string>
     <string name="general_query_purchased_items_failed_message">Query failed</string>
     <string name="general_query_get_sku_detail_failed_message">Get sku detail failed</string>
+    <string name="general_check_trial_subscription_failed_message">Check Trial Subscription failed</string>
     <string name="general_user_purchased_item_message">User has bought this item</string>
     <string name="general_user_did_not_purchased_item_message">User has not bought this item</string>
 

detekt.yml

@@ -63,8 +63,8 @@ complexity:
   TooManyFunctions:
     active: true
     thresholdInFiles: 20
-    thresholdInClasses: 12
-    thresholdInInterfaces: 8
+    thresholdInClasses: 13
+    thresholdInInterfaces: 9
     thresholdInObjects: 11
     thresholdInEnums: 11
     ignorePrivate: true

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

@@ -10,6 +10,7 @@ import ir.cafebazaar.poolakey.Connection
 import ir.cafebazaar.poolakey.Payment
 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
 
@@ -187,6 +188,19 @@ fun Payment.getSubscriptionSkuDetails(
     }
 }
 
+/**
+ * You can use this function to check trial subscription,
+ * @return Single that you can subscribe to it and get the trial subscription info.
+ */
+fun Payment.checkTrialSubscription(): Single<TrialSubscriptionInfo> {
+    return Single.create { emitter ->
+        checkTrialSubscription {
+            checkTrialSubscriptionSucceed { emitter.onSuccess(it) }
+            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

poolakey-rx3/src/main/java/ir/cafebazaar/poolakey/rx3/PaymentRx3.kt

@@ -10,6 +10,7 @@ import ir.cafebazaar.poolakey.Connection
 import ir.cafebazaar.poolakey.Payment
 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
 
@@ -183,6 +184,19 @@ fun Payment.getSubscriptionSkuDetails(skuIds: List<String>): Single<List<SkuDeta
     }
 }
 
+/**
+ * You can use this function to check trial subscription,
+ * @return Single that you can subscribe to it and get the trial subscription info.
+ */
+fun Payment.checkTrialSubscription(): Single<TrialSubscriptionInfo> {
+    return Single.create { emitter ->
+        checkTrialSubscription {
+            checkTrialSubscriptionSucceed { emitter.onSuccess(it) }
+            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

poolakey-rxbase/src/main/java/ir/cafebazaar/poolakey/rxbase/exception/PurchaseCanceledException.kt

@@ -4,7 +4,7 @@ import java.lang.Exception
 
 class PurchaseCanceledException : Exception() {
 
-    override val message: String?
+    override val message: String
         get() = "Purchase canceled by user"
 
 }

poolakey/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
                 <action android:name="com.farsitel.bazaar.consume" />
                 <action android:name="com.farsitel.bazaar.getPurchase" />
                 <action android:name="com.farsitel.bazaar.skuDetail" />
+                <action android:name="com.farsitel.bazaar.checkTrialSubscription" />
             </intent-filter>
         </receiver>
     </application>

poolakey/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl

@@ -48,4 +48,8 @@ interface IInAppBillingService {
         String sku,
         String developerPayload,
         in Bundle extraData);
+
+    Bundle checkTrialSubscription(String packageName);
+
+    Bundle getFeatureConfig();
 }

poolakey/src/main/java/ir/cafebazaar/poolakey/BillingConnection.kt

@@ -9,11 +9,14 @@ import ir.cafebazaar.poolakey.billing.connection.ServiceBillingConnection
 import ir.cafebazaar.poolakey.billing.query.QueryFunction
 import ir.cafebazaar.poolakey.billing.skudetail.GetSkuDetailFunction
 import ir.cafebazaar.poolakey.billing.skudetail.SkuDetailFunctionRequest
+import ir.cafebazaar.poolakey.billing.trialsubscription.CheckTrialSubscriptionFunction
+import ir.cafebazaar.poolakey.billing.trialsubscription.CheckTrialSubscriptionFunctionRequest
 import ir.cafebazaar.poolakey.callback.ConnectionCallback
 import ir.cafebazaar.poolakey.callback.ConsumeCallback
 import ir.cafebazaar.poolakey.callback.GetSkuDetailsCallback
 import ir.cafebazaar.poolakey.callback.PurchaseIntentCallback
 import ir.cafebazaar.poolakey.callback.PurchaseQueryCallback
+import ir.cafebazaar.poolakey.callback.CheckTrialSubscriptionCallback
 import ir.cafebazaar.poolakey.config.PaymentConfiguration
 import ir.cafebazaar.poolakey.request.PurchaseRequest
 import ir.cafebazaar.poolakey.thread.PoolakeyThread
@@ -24,6 +27,7 @@ internal class BillingConnection(
     private val backgroundThread: PoolakeyThread<Runnable>,
     private val queryFunction: QueryFunction,
     private val skuDetailFunction: GetSkuDetailFunction,
+    private val checkTrialSubscriptionFunction: CheckTrialSubscriptionFunction,
     private val mainThread: PoolakeyThread<() -> Unit>
 ) {
 
@@ -41,6 +45,7 @@ internal class BillingConnection(
             paymentConfiguration,
             queryFunction,
             skuDetailFunction,
+            checkTrialSubscriptionFunction,
             ::disconnect
         )
 
@@ -133,6 +138,17 @@ internal class BillingConnection(
         }
     }
 
+    fun checkTrialSubscription(
+        callback: CheckTrialSubscriptionCallback.() -> Unit
+    ) {
+        runOnCommunicator(TAG_CHECK_TRIAL_SUBSCRIPTION) {
+            requireNotNull(billingCommunicator).checkTrialSubscription(
+                CheckTrialSubscriptionFunctionRequest(callback),
+                callback
+            )
+        }
+    }
+
     private fun stopConnection() {
         runOnCommunicator(TAG_STOP_CONNECTION) {
             requireNotNull(billingCommunicator).stopConnection()
@@ -165,10 +181,12 @@ internal class BillingConnection(
     }
 
     companion object {
+
         private const val TAG_STOP_CONNECTION = "stopConnection"
         private const val TAG_QUERY_PURCHASE_PRODUCT = "queryPurchasedProducts"
         private const val TAG_CONSUME = "consume"
         private const val TAG_PURCHASE = "purchase"
         private const val TAG_GET_SKU_DETAIL = "skuDetial"
+        private const val TAG_CHECK_TRIAL_SUBSCRIPTION = "checkTrialSubscription"
     }
 }