From a3b48718463770fb3822e193433443975fbf0edb Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Thu, 9 May 2019 12:46:46 +0300
Subject: [PATCH 01/12] migrate to billing v2.0

---
 .../com/gen/rxbilling/sample/MainActivity.kt  | 30 +++++--
 app/src/main/res/layout/activity_main.xml     |  8 +-
 app/src/main/res/values/strings.xml           |  1 +
 dependencies.gradle                           |  4 +-
 gradle.properties                             |  2 +-
 .../com/gen/rxbilling/client/RxBilling.kt     | 87 +++++++++++++------
 .../connection/BillingClientFactory.kt        | 21 +++--
 .../connection/BillingServiceFactory.kt       | 11 ++-
 .../rxbilling/exception/BillingException.kt   | 54 ++++++------
 .../com/gen/rxbilling/flow/RxBillingFlow.kt   | 35 +++++---
 10 files changed, 165 insertions(+), 88 deletions(-)

diff --git a/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt b/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
index 2f64194..7c241e6 100644
--- a/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
+++ b/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingFlowParams
+import com.android.billingclient.api.SkuDetails
 import com.gen.rxbilling.client.RxBilling
 import com.gen.rxbilling.client.RxBillingImpl
 import com.gen.rxbilling.connection.BillingClientFactory
@@ -45,6 +46,9 @@ class MainActivity : AppCompatActivity() {
         btnLoadDetails.setOnClickListener {
             loadDetails()
         }
+        btnAcknowledge.setOnClickListener {
+            acknowledge()
+        }
     }
 
     override fun onStart() {
@@ -87,15 +91,14 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun startFlowWithClient() {
-       disposable.add(rxBilling.launchFlow(this, BillingFlowParams.newBuilder()
-               .setSku("you_id")
-               .setType(BillingClient.SkuType.SUBS)
-               .build())
-               .subscribe({
-                   Timber.d("startFlowWithClient")
-               }, {
-                   Timber.e(it)
-               }))
+        disposable.add(rxBilling.launchFlow(this, BillingFlowParams.newBuilder()
+                .setSkuDetails(SkuDetails("{}"))
+                .build())
+                .subscribe({
+                    Timber.d("startFlowWithClient")
+                }, {
+                    Timber.e(it)
+                }))
     }
 
     private fun loadPurchases() {
@@ -127,4 +130,13 @@ class MainActivity : AppCompatActivity() {
                     Timber.e(it)
                 }))
     }
+
+    private fun acknowledge() {
+        disposable.add(rxBilling.acknowledge("token")
+                .subscribe({
+                    Timber.d("acknowledge success")
+                }, {
+                    Timber.e(it)
+                }))
+    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cd10e23..e3720c1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -66,7 +66,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
+        <Button
+            android:id="@+id/btnAcknowledge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/acknowledge" />
+
     </LinearLayout>
 
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b44946..bd64ecf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,4 +5,5 @@
     <string name="load_purchases">Load purchases</string>
     <string name="load_history">Load history</string>
     <string name="load_details">Load details</string>
+    <string name="acknowledge">Acknowledge</string>
 </resources>
diff --git a/dependencies.gradle b/dependencies.gradle
index 1723bb7..4e9c02d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -31,7 +31,7 @@ ext {
     conductorLifecycleVer = '0.1.1'
 
     // Billing Client
-    billingClientVer = '1.1'
+    billingClientVer = '2.0.0'
 
     // Developer-related
     timberVer = '4.7.0'
@@ -100,4 +100,4 @@ ext {
             supportAnnotations: "com.android.support:support-annotations:$supportLibraryVer",
             testArchCore      : "android.arch.core:core-testing:$archComponentsVer"
     ]
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index 67295ad..7fa9859 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,4 @@ VCS_ISSUES_URL=https://github.com/betterme-dev/RxBilling/issues
 
 POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
-POM_LICENCE_DIST=repo
\ No newline at end of file
+POM_LICENCE_DIST=repo
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
index 52af4f1..7a802dd 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
@@ -23,9 +23,9 @@ interface RxBilling : Connectable<BillingClient> {
 
     fun getSubscriptions(): Single<List<Purchase>>
 
-    fun getPurchaseHistory(): Single<List<Purchase>>
+    fun getPurchaseHistory(): Single<List<PurchaseHistoryRecord>>
 
-    fun getSubscriptionHistory(): Single<List<Purchase>>
+    fun getSubscriptionHistory(): Single<List<PurchaseHistoryRecord>>
 
     fun getPurchaseSkuDetails(ids: List<String>): Single<List<SkuDetails>>
 
@@ -34,6 +34,8 @@ interface RxBilling : Connectable<BillingClient> {
     fun launchFlow(activity: Activity, params: BillingFlowParams): Completable
 
     fun consumeProduct(purchaseToken: String): Completable
+
+    fun acknowledge(purchaseToken: String): Completable
 }
 
 class RxBillingImpl(billingFactory: BillingClientFactory)
@@ -41,11 +43,12 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
 
     private val updateSubject = PublishSubject.create<PurchasesUpdate>()
 
-    private val updatedListener = PurchasesUpdatedListener { responseCode, purchases ->
-        Timber.d("$responseCode", "$purchases")
+    private val updatedListener = PurchasesUpdatedListener { result, purchases ->
+        Timber.d("$result", "$purchases")
+        val responseCode = result.responseCode
         val event = when (responseCode) {
-            BillingClient.BillingResponse.OK -> PurchasesUpdate.Success(responseCode, purchases.orEmpty())
-            BillingClient.BillingResponse.USER_CANCELED -> PurchasesUpdate.Canceled(responseCode, purchases.orEmpty())
+            BillingClient.BillingResponseCode.OK -> PurchasesUpdate.Success(responseCode, purchases.orEmpty())
+            BillingClient.BillingResponseCode.USER_CANCELED -> PurchasesUpdate.Canceled(responseCode, purchases.orEmpty())
             else -> PurchasesUpdate.Failed(responseCode, purchases.orEmpty())
         }
         updateSubject.onNext(event)
@@ -74,11 +77,11 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
         return getBoughtItems(BillingClient.SkuType.SUBS)
     }
 
-    override fun getPurchaseHistory(): Single<List<Purchase>> {
+    override fun getPurchaseHistory(): Single<List<PurchaseHistoryRecord>> {
         return getHistory(BillingClient.SkuType.INAPP)
     }
 
-    override fun getSubscriptionHistory(): Single<List<Purchase>> {
+    override fun getSubscriptionHistory(): Single<List<PurchaseHistoryRecord>> {
         return getHistory(BillingClient.SkuType.SUBS)
     }
 
@@ -99,10 +102,10 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
                 }
                 .firstOrError()
                 .flatMapCompletable {
-                    return@flatMapCompletable if (isSuccess(it)) {
+                    return@flatMapCompletable if (isSuccess(it.responseCode)) {
                         Completable.complete()
                     } else {
-                        Completable.error(BillingException.fromCode(it))
+                        Completable.error(BillingException.fromResult(it))
                     }
                 }
     }
@@ -111,13 +114,40 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
         return connectionFlowable
                 .flatMap { client ->
                     Flowable.create<Int>({
-                        client.consumeAsync(purchaseToken) { responseCode, _ ->
+                        val params = ConsumeParams.newBuilder()
+                                .setPurchaseToken(purchaseToken)
+                                .build()
+                        client.consumeAsync(params) { result, _ ->
                             if (it.isCancelled) return@consumeAsync
+                            val responseCode = result.responseCode
                             if (isSuccess(responseCode)) {
                                 it.onNext(responseCode)
                                 it.onComplete()
                             } else {
-                                it.onError(BillingException.fromCode(responseCode))
+                                it.onError(BillingException.fromResult(result))
+                            }
+                        }
+                    }, BackpressureStrategy.LATEST)
+                }
+                .firstOrError()
+                .toCompletable()
+    }
+
+    override fun acknowledge(purchaseToken: String): Completable {
+        return connectionFlowable
+                .flatMap { client ->
+                    Flowable.create<Int>({
+                        client.acknowledgePurchase(AcknowledgePurchaseParams.newBuilder()
+                                .setPurchaseToken(purchaseToken)
+                                .build()
+                        ) { result ->
+                            if (it.isCancelled) return@acknowledgePurchase
+                            val responseCode = result.responseCode
+                            if (isSuccess(responseCode)) {
+                                it.onNext(responseCode)
+                                it.onComplete()
+                            } else {
+                                it.onError(BillingException.fromResult(result))
                             }
                         }
                     }, BackpressureStrategy.LATEST)
@@ -133,47 +163,52 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
                     return@flatMap if (isSuccess(purchasesResult.responseCode)) {
                         Flowable.just(purchasesResult.purchasesList.orEmpty())
                     } else {
-                        Flowable.error<List<Purchase>>(BillingException.fromCode(purchasesResult.responseCode))
+                        Flowable.error<List<Purchase>>(BillingException.fromResult(purchasesResult.billingResult))
                     }
                 }.firstOrError()
     }
 
-    private fun getHistory(type: String): Single<List<Purchase>> {
+    private fun getHistory(type: String): Single<List<PurchaseHistoryRecord>> {
         return connectionFlowable
                 .flatMap { client ->
-                    Flowable.create<List<Purchase>>({
-                        client.queryPurchaseHistoryAsync(type, { responseCode: Int, mutableList: MutableList<Purchase>? ->
+                    Flowable.create<List<PurchaseHistoryRecord>>({
+                        client.queryPurchaseHistoryAsync(type) { billingResult: BillingResult, list: MutableList<PurchaseHistoryRecord>? ->
                             if (it.isCancelled) return@queryPurchaseHistoryAsync
+                            val responseCode = billingResult.responseCode
                             if (isSuccess(responseCode)) {
-                                it.onNext(mutableList.orEmpty())
+                                it.onNext(list.orEmpty())
                                 it.onComplete()
                             } else {
-                                it.onError(BillingException.fromCode(responseCode))
+                                it.onError(BillingException.fromResult(billingResult))
                             }
-                        })
+                        }
                     }, BackpressureStrategy.LATEST)
                 }.firstOrError()
     }
 
     private fun getSkuDetails(ids: List<String>, type: String): Single<List<SkuDetails>> {
-        val params = SkuDetailsParams.newBuilder().setSkusList(ids).setType(type).build()
+        val params = SkuDetailsParams.newBuilder()
+                .setSkusList(ids)
+                .setType(type)
+                .build()
         return connectionFlowable
                 .flatMap { client ->
                     Flowable.create<List<SkuDetails>>({
-                        client.querySkuDetailsAsync(params, { responseCode: Int, mutableList: MutableList<SkuDetails>? ->
+                        client.querySkuDetailsAsync(params) { billingResult, skuDetailsList ->
                             if (it.isCancelled) return@querySkuDetailsAsync
+                            val responseCode = billingResult.responseCode
                             if (isSuccess(responseCode)) {
-                                it.onNext(mutableList.orEmpty())
+                                it.onNext(skuDetailsList.orEmpty())
                                 it.onComplete()
                             } else {
-                                it.onError(BillingException.fromCode(responseCode))
+                                it.onError(BillingException.fromResult(billingResult))
                             }
-                        })
+                        }
                     }, BackpressureStrategy.LATEST)
                 }.firstOrError()
     }
 
     private fun isSuccess(responseCode: Int): Boolean {
-        return responseCode == BillingClient.BillingResponse.OK
+        return responseCode == BillingClient.BillingResponseCode.OK
     }
-}
\ No newline at end of file
+}
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/connection/BillingClientFactory.kt b/rxbilling/src/main/java/com/gen/rxbilling/connection/BillingClientFactory.kt
index 1b5f275..4d4a5d9 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/connection/BillingClientFactory.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/connection/BillingClientFactory.kt
@@ -3,6 +3,7 @@ package com.gen.rxbilling.connection
 import android.content.Context
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingClientStateListener
+import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.gen.rxbilling.exception.BillingException
 import io.reactivex.BackpressureStrategy
@@ -11,13 +12,16 @@ import io.reactivex.FlowableTransformer
 import timber.log.Timber
 
 class BillingClientFactory(private val context: Context,
-                           private val transformer:
-                           FlowableTransformer<BillingClient, BillingClient>
-                           = RepeatConnectionTransformer()) {
+                           private val transformer: FlowableTransformer<BillingClient, BillingClient>
+                           = RepeatConnectionTransformer()
+) {
 
     fun createBillingFlowable(listener: PurchasesUpdatedListener): Flowable<BillingClient> {
         val flowable = Flowable.create<BillingClient>({
-            val billingClient = BillingClient.newBuilder(context).setListener(listener).build()
+            val billingClient = BillingClient.newBuilder(context)
+                    .enablePendingPurchases()
+                    .setListener(listener)
+                    .build()
             Timber.d("startConnection")
             billingClient.startConnection(object : BillingClientStateListener {
                 override fun onBillingServiceDisconnected() {
@@ -27,13 +31,14 @@ class BillingClientFactory(private val context: Context,
                     }
                 }
 
-                override fun onBillingSetupFinished(responseCode: Int) {
+                override fun onBillingSetupFinished(result: BillingResult) {
+                    val responseCode = result.responseCode
                     Timber.d("onBillingSetupFinished response $responseCode isReady ${billingClient.isReady}")
                     if (!it.isCancelled) {
-                        if (responseCode == BillingClient.BillingResponse.OK) {
+                        if (responseCode == BillingClient.BillingResponseCode.OK) {
                             it.onNext(billingClient)
                         } else {
-                            it.onError(BillingException.fromCode(responseCode))
+                            it.onError(BillingException.fromResult(result))
                         }
                     } else {
                         if (billingClient.isReady) {
@@ -53,4 +58,4 @@ class BillingClientFactory(private val context: Context,
 
         return flowable.compose(transformer)
     }
-}
\ No newline at end of file
+}
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/connection/BillingServiceFactory.kt b/rxbilling/src/main/java/com/gen/rxbilling/connection/BillingServiceFactory.kt
index 8e51516..2fb9332 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/connection/BillingServiceFactory.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/connection/BillingServiceFactory.kt
@@ -5,6 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
+import com.android.billingclient.api.BillingClient
+import com.android.billingclient.api.BillingResult
 import com.android.vending.billing.IInAppBillingService
 import com.gen.rxbilling.exception.BillingException
 import io.reactivex.BackpressureStrategy
@@ -50,7 +52,12 @@ class BillingServiceFactory(private val context: Context,
             }
             val bindService = context.bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE)
             if (!bindService && !emitter.isCancelled) {
-                emitter.onError(BillingException.BillingUnavailableException())
+                emitter.onError(BillingException.BillingUnavailableException(
+                        BillingResult.newBuilder()
+                                .setResponseCode(BillingClient.BillingResponseCode.BILLING_UNAVAILABLE)
+                                .setDebugMessage("")
+                                .build()
+                ))
                 return@create
             }
             emitter.setCancellable {
@@ -62,4 +69,4 @@ class BillingServiceFactory(private val context: Context,
         }, BackpressureStrategy.LATEST)
         return flowable.compose(transformer)
     }
-}
\ No newline at end of file
+}
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/exception/BillingException.kt b/rxbilling/src/main/java/com/gen/rxbilling/exception/BillingException.kt
index 6089210..9842250 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/exception/BillingException.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/exception/BillingException.kt
@@ -1,38 +1,38 @@
 package com.gen.rxbilling.exception
 
 import com.android.billingclient.api.BillingClient
+import com.android.billingclient.api.BillingResult
 
-sealed class BillingException(open val code: Int) :
-        Exception("Billing error, code $code") {
+sealed class BillingException(result: BillingResult) :
+        Exception("Billing error, code ${result.responseCode}\n${result.debugMessage}") {
 
     companion object {
-        fun fromCode(code: Int): BillingException {
-            return when (code) {
-                BillingClient.BillingResponse.FEATURE_NOT_SUPPORTED -> FeatureNotSupportedException()
-                BillingClient.BillingResponse.SERVICE_DISCONNECTED -> ServiceDisconnectedException()
-                BillingClient.BillingResponse.USER_CANCELED -> UserCanceledException()
-                BillingClient.BillingResponse.SERVICE_UNAVAILABLE -> ServiceUnavailableException()
-                BillingClient.BillingResponse.BILLING_UNAVAILABLE -> BillingUnavailableException()
-                BillingClient.BillingResponse.ITEM_UNAVAILABLE -> ItemUnavailableException()
-                BillingClient.BillingResponse.DEVELOPER_ERROR -> DeveloperErrorException()
-                BillingClient.BillingResponse.ERROR -> FatalException()
-                BillingClient.BillingResponse.ITEM_ALREADY_OWNED -> AlreadyOwnedException()
-                BillingClient.BillingResponse.ITEM_NOT_OWNED -> NotOwnedException()
-                else -> UnknownException(code)
+        fun fromResult(result: BillingResult): BillingException {
+            return when (result.responseCode) {
+                BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED -> FeatureNotSupportedException(result)
+                BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> ServiceDisconnectedException(result)
+                BillingClient.BillingResponseCode.USER_CANCELED -> UserCanceledException(result)
+                BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE -> ServiceUnavailableException(result)
+                BillingClient.BillingResponseCode.BILLING_UNAVAILABLE -> BillingUnavailableException(result)
+                BillingClient.BillingResponseCode.ITEM_UNAVAILABLE -> ItemUnavailableException(result)
+                BillingClient.BillingResponseCode.DEVELOPER_ERROR -> DeveloperErrorException(result)
+                BillingClient.BillingResponseCode.ERROR -> FatalException(result)
+                BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> AlreadyOwnedException(result)
+                BillingClient.BillingResponseCode.ITEM_NOT_OWNED -> NotOwnedException(result)
+                else -> UnknownException(result)
             }
         }
     }
 
-
-    class FeatureNotSupportedException : BillingException(BillingClient.BillingResponse.FEATURE_NOT_SUPPORTED)
-    class ServiceDisconnectedException : BillingException(BillingClient.BillingResponse.SERVICE_DISCONNECTED)
-    class UserCanceledException : BillingException(BillingClient.BillingResponse.USER_CANCELED)
-    class ServiceUnavailableException : BillingException(BillingClient.BillingResponse.SERVICE_UNAVAILABLE)
-    class BillingUnavailableException : BillingException(BillingClient.BillingResponse.BILLING_UNAVAILABLE)
-    class ItemUnavailableException : BillingException(BillingClient.BillingResponse.ITEM_UNAVAILABLE)
-    class DeveloperErrorException : BillingException(BillingClient.BillingResponse.DEVELOPER_ERROR)
-    class FatalException : BillingException(BillingClient.BillingResponse.ERROR)
-    class AlreadyOwnedException : BillingException(BillingClient.BillingResponse.ITEM_ALREADY_OWNED)
-    class NotOwnedException : BillingException(BillingClient.BillingResponse.ITEM_NOT_OWNED)
-    class UnknownException(code: Int) : BillingException(code)
+    class FeatureNotSupportedException(result: BillingResult) : BillingException(result)
+    class ServiceDisconnectedException(result: BillingResult) : BillingException(result)
+    class UserCanceledException(result: BillingResult) : BillingException(result)
+    class ServiceUnavailableException(result: BillingResult) : BillingException(result)
+    class BillingUnavailableException(result: BillingResult) : BillingException(result)
+    class ItemUnavailableException(result: BillingResult) : BillingException(result)
+    class DeveloperErrorException(result: BillingResult) : BillingException(result)
+    class FatalException(result: BillingResult) : BillingException(result)
+    class AlreadyOwnedException(result: BillingResult) : BillingException(result)
+    class NotOwnedException(result: BillingResult) : BillingException(result)
+    class UnknownException(result: BillingResult) : BillingException((result))
 }
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt b/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
index c2c0e2d..8c1c3ff 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
@@ -4,9 +4,10 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import com.android.billingclient.api.BillingClient
+import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.util.BillingHelper
-import com.android.billingclient.util.BillingHelper.RESPONSE_BUY_INTENT
+import com.android.billingclient.util.BillingHelper.RESPONSE_BUY_INTENT_KEY
 import com.android.vending.billing.IInAppBillingService
 import com.gen.rxbilling.connection.BillingServiceFactory
 import com.gen.rxbilling.exception.BillingException
@@ -38,19 +39,23 @@ class RxBillingFlow(
                             request.type,
                             /* developerPayload */ null)
                     val responseCode = BillingHelper.getResponseCodeFromBundle(buyIntentBundle, null)
-                    if (responseCode == BillingClient.BillingResponse.OK) {
-                        val pendingIntent: PendingIntent = buyIntentBundle.getParcelable(RESPONSE_BUY_INTENT)
+                    val responseMessage = BillingHelper.getDebugMessageFromBundle(buyIntentBundle, null)
+                    val billingResult = BillingResult.newBuilder()
+                            .setResponseCode(responseCode)
+                            .setDebugMessage(responseMessage)
+                            .build()
+                    if (responseCode == BillingClient.BillingResponseCode.OK) {
+                        val pendingIntent: PendingIntent = buyIntentBundle.getParcelable(RESPONSE_BUY_INTENT_KEY)!!
                         delegate.startFlow(pendingIntent, request.requestCode)
                         return@flatMap Flowable.just(responseCode)
                     } else {
-                        return@flatMap Flowable.error<Int>(BillingException.fromCode(responseCode))
+                        return@flatMap Flowable.error<Int>(BillingException.fromResult(billingResult))
                     }
                 }
                 .firstOrError()
                 .toCompletable()
     }
 
-
     fun replaceItem(request: ReplaceItemRequest, delegate: FlowDelegate): Completable {
         return connectionFlowable
                 .flatMap {
@@ -64,12 +69,17 @@ class RxBillingFlow(
 
                     )
                     val responseCode = BillingHelper.getResponseCodeFromBundle(buyIntentBundle, null)
-                    if (responseCode == BillingClient.BillingResponse.OK) {
-                        val pendingIntent: PendingIntent = buyIntentBundle.getParcelable(RESPONSE_BUY_INTENT)
+                    val responseMessage = BillingHelper.getDebugMessageFromBundle(buyIntentBundle, null)
+                    val billingResult = BillingResult.newBuilder()
+                            .setResponseCode(responseCode)
+                            .setDebugMessage(responseMessage)
+                            .build()
+                    if (responseCode == BillingClient.BillingResponseCode.OK) {
+                        val pendingIntent: PendingIntent = buyIntentBundle.getParcelable(RESPONSE_BUY_INTENT_KEY)!!
                         delegate.startFlow(pendingIntent, request.requestCode)
                         return@flatMap Flowable.just(responseCode)
                     } else {
-                        return@flatMap Flowable.error<Int>(BillingException.fromCode(responseCode))
+                        return@flatMap Flowable.error<Int>(BillingException.fromResult(billingResult))
                     }
                 }
                 .firstOrError()
@@ -80,14 +90,15 @@ class RxBillingFlow(
         return Single.create<Purchase> {
             if (it.isDisposed) return@create
             Timber.d("onActivityResult %s", data?.extras)
-            val responseCode = BillingHelper.getResponseCodeFromIntent(data, null)
+            val billingResult = BillingHelper.getBillingResultFromIntent(data, null)
+            val responseCode = billingResult.responseCode
             when (responseCode) {
-                BillingClient.BillingResponse.OK -> {
+                BillingClient.BillingResponseCode.OK -> {
                     val purchases = BillingHelper.extractPurchases(data?.extras)
                     it.onSuccess(purchases[0])
                 }
-                else -> it.onError(BillingException.fromCode(responseCode))
+                else -> it.onError(BillingException.fromResult(billingResult))
             }
         }
     }
-}
\ No newline at end of file
+}

From 7b115709b4e306b2a9a294ca2bc433b9b03080aa Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Thu, 9 May 2019 14:23:01 +0300
Subject: [PATCH 02/12] update libs, refactoring

---
 app/build.gradle                              |   6 +-
 .../com/gen/rxbilling/sample/MainActivity.kt  | 140 ++++++++++--------
 build.gradle                                  |   4 +-
 dependencies.gradle                           |  40 ++---
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 rxbilling/build.gradle                        |   8 +-
 .../com/gen/rxbilling/client/RxBilling.kt     |  97 ++++++------
 .../com/gen/rxbilling/flow/RxBillingFlow.kt   |   4 +-
 .../flow/delegate/ConductorFlowDelegate.kt    |  13 --
 .../{androidx => }/FragmentFlowDelegate.kt    |   5 +-
 .../delegate/support/FragmentFlowDelegate.kt  |  14 --
 .../BillingConnectionManager.kt               |   5 +-
 .../arch/BillingConnectionManager.kt          |  33 -----
 13 files changed, 151 insertions(+), 222 deletions(-)
 delete mode 100644 rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/ConductorFlowDelegate.kt
 rename rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/{androidx => }/FragmentFlowDelegate.kt (78%)
 delete mode 100644 rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/support/FragmentFlowDelegate.kt
 rename rxbilling/src/main/java/com/gen/rxbilling/lifecycle/{androidx => }/BillingConnectionManager.kt (89%)
 delete mode 100644 rxbilling/src/main/java/com/gen/rxbilling/lifecycle/arch/BillingConnectionManager.kt

diff --git a/app/build.gradle b/app/build.gradle
index 15af0e6..f809c08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,12 +35,12 @@ dependencies {
 
     implementation kotlinDependencies.kotlinStdLib
     implementation dataDependencies.billingClient
-    implementation presentationDependencies.lifecycleExtensions
-    kapt presentationDependencies.lifecycleCompiler
+    implementation androidXdependencies.lifecycleExtensions
+    kapt androidXdependencies.lifecycleCompiler
     implementation developmentDependencies.timber
     implementation dataDependencies.rxJava
     implementation dataDependencies.rxAndroid
-    implementation supportDependencies.appCompat
+    implementation androidXdependencies.appCompat
 
     testImplementation testDependencies.jUnit
     testImplementation testDependencies.mockito
diff --git a/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt b/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
index 7c241e6..bd213e5 100644
--- a/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
+++ b/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
@@ -2,10 +2,8 @@ package com.gen.rxbilling.sample
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import com.android.billingclient.api.BillingClient
-import com.android.billingclient.api.BillingFlowParams
-import com.android.billingclient.api.SkuDetails
+import androidx.appcompat.app.AppCompatActivity
+import com.android.billingclient.api.*
 import com.gen.rxbilling.client.RxBilling
 import com.gen.rxbilling.client.RxBillingImpl
 import com.gen.rxbilling.connection.BillingClientFactory
@@ -13,7 +11,7 @@ import com.gen.rxbilling.connection.BillingServiceFactory
 import com.gen.rxbilling.flow.delegate.ActivityFlowDelegate
 import com.gen.rxbilling.flow.BuyItemRequest
 import com.gen.rxbilling.flow.RxBillingFlow
-import com.gen.rxbilling.lifecycle.arch.BillingConnectionManager
+import com.gen.rxbilling.lifecycle.BillingConnectionManager
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.activity_main.*
 import timber.log.Timber
@@ -53,14 +51,15 @@ class MainActivity : AppCompatActivity() {
 
     override fun onStart() {
         super.onStart()
-        disposable.add(rxBilling.observeUpdates()
-                .subscribe({
-                    Timber.d("observeUpdates $it")
-                    tvClientFlow.text = it.toString()
-                }, {
-                    Timber.e(it)
-                    tvClientFlow.text = it.toString()
-                }))
+        disposable.add(
+                rxBilling.observeUpdates()
+                        .subscribe({
+                            Timber.d("observeUpdates $it")
+                            tvClientFlow.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                            tvClientFlow.text = it.toString()
+                        }))
     }
 
     override fun onStop() {
@@ -70,73 +69,88 @@ class MainActivity : AppCompatActivity() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        disposable.add(rxBillingFlow.handleActivityResult(resultCode, data)
-                .subscribe({
-                    Timber.d("onActivityResult $it")
-                    tvServiceFlow.text = it.toString()
-                }, {
-                    Timber.e(it)
-                    tvServiceFlow.text = it.toString()
-                }))
+        disposable.add(
+                rxBillingFlow.handleActivityResult(resultCode, data)
+                        .subscribe({
+                            Timber.d("onActivityResult $it")
+                            tvServiceFlow.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                            tvServiceFlow.text = it.toString()
+                        }))
     }
 
     private fun startFlowWithService() {
-        disposable.add(rxBillingFlow.buyItem(BuyItemRequest(BillingClient.SkuType.SUBS, "your_id", 101),
-                ActivityFlowDelegate(this))
-                .subscribe({
-                    Timber.d("flow started")
-                }, {
-                    Timber.e(it)
-                }))
+        disposable.add(
+                rxBillingFlow.buyItem(BuyItemRequest(BillingClient.SkuType.SUBS, "your_id", 101),
+                        ActivityFlowDelegate(this))
+                        .subscribe({
+                            Timber.d("flow started")
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 
     private fun startFlowWithClient() {
-        disposable.add(rxBilling.launchFlow(this, BillingFlowParams.newBuilder()
-                .setSkuDetails(SkuDetails("{}"))
-                .build())
-                .subscribe({
-                    Timber.d("startFlowWithClient")
-                }, {
-                    Timber.e(it)
-                }))
+        disposable.add(
+                rxBilling.launchFlow(this, BillingFlowParams.newBuilder()
+                        .setSkuDetails(SkuDetails("{}"))
+                        .build())
+                        .subscribe({
+                            Timber.d("startFlowWithClient")
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 
     private fun loadPurchases() {
-        disposable.add(rxBilling.getPurchases()
-                .subscribe({
-                    Timber.d("getPurchases $it")
-                    tvPurchases.text = it.toString()
-                }, {
-                    Timber.e(it)
-                }))
+        disposable.add(
+                rxBilling.getPurchases()
+                        .subscribe({
+                            Timber.d("getPurchases $it")
+                            tvPurchases.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 
     private fun loadHistory() {
-        disposable.add(rxBilling.getPurchaseHistory()
-                .subscribe({
-                    Timber.d("getPurchaseHistory $it")
-                    tvHistory.text = it.toString()
-                }, {
-                    Timber.e(it)
-                }))
+        disposable.add(
+                rxBilling.getPurchaseHistory()
+                        .subscribe({
+                            Timber.d("getPurchaseHistory $it")
+                            tvHistory.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 
     private fun loadDetails() {
-        disposable.add(rxBilling.getPurchaseSkuDetails(listOf("your_id1", "your_id2"))
-                .subscribe({
-                    Timber.d("loadDetails $it")
-                    tvDetails.text = it.toString()
-                }, {
-                    Timber.e(it)
-                }))
+        disposable.add(
+                rxBilling.getSkuDetails(
+                        SkuDetailsParams.newBuilder()
+                                .setSkusList(listOf("your_id1", "your_id2"))
+                                .setType(BillingClient.SkuType.SUBS)
+                                .build())
+                        .subscribe({
+                            Timber.d("loadDetails $it")
+                            tvDetails.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 
     private fun acknowledge() {
-        disposable.add(rxBilling.acknowledge("token")
-                .subscribe({
-                    Timber.d("acknowledge success")
-                }, {
-                    Timber.e(it)
-                }))
+        disposable.add(
+                rxBilling.acknowledge(
+                        AcknowledgePurchaseParams.newBuilder()
+                                .setPurchaseToken("token")
+                                .setDeveloperPayload("payload")
+                                .build())
+                        .subscribe({
+                            Timber.d("acknowledge success")
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 }
diff --git a/build.gradle b/build.gradle
index 06d0d7c..3b36b06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 apply from: 'dependencies.gradle'
 
 buildscript {
-    ext.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.3.31'
     ext.maven_version = '1.5'
     ext.bintray_version = '1.7.2'
     ext.dokka_version = '0.9.16'
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.github.dcendents:android-maven-gradle-plugin:$maven_version"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
diff --git a/dependencies.gradle b/dependencies.gradle
index 4e9c02d..77a1505 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -4,37 +4,30 @@ ext {
     targetSdkVer = 28
 
     versionCode = 1
-    versionName = '0.9.2'
+    versionName = '2.0.0'
 
     // Kotlin
-    kotlinVer = '1.2.50'
-    androidKtxVer = '1.0.0-alpha1'
+    kotlinVer = '1.3.31'
+    androidKtxVer = '1.0.1'
 
     // Support library
     supportLibraryVer = '28.0.0-alpha1'
     constraintLayout = '1.0.2'
 
     // AndroidX
-    xAppCompatVer = '1.0.0-alpha1'
-    xLifecycleVer = '2.0.0-alpha1'
-    xFragmentVer = '1.0.0-alpha1'
-
-    // Architecture components
-    archComponentsVer = '1.1.0'
-    lifecycleVer = "1.1.1"
+    xAppCompatVer = '1.1.0-alpha05'
+    xLifecycleVer = '2.0.0'
+    xFragmentVer = '1.1.0-alpha08'
 
     // Reactive Extensions
-    rxJava2Ver = '2.1.10'
-    rxAndroid2Ver = '2.0.1'
-
-    conductorVer = '2.1.4'
-    conductorLifecycleVer = '0.1.1'
+    rxJava2Ver = '2.2.8'
+    rxAndroid2Ver = '2.1.1'
 
     // Billing Client
     billingClientVer = '2.0.0'
 
     // Developer-related
-    timberVer = '4.7.0'
+    timberVer = '4.7.1'
 
     // Unit-tests
     jUnitVer = '4.12'
@@ -48,10 +41,6 @@ ext {
     espressoCoreVer = '3.0.1'
 
     // Dependencies
-    supportDependencies = [
-            appCompat: "com.android.support:appcompat-v7:$supportLibraryVer",
-            design   : "com.android.support:design:$supportLibraryVer",
-    ]
 
     androidXdependencies = [
             appCompat          : "androidx.appcompat:appcompat:$xAppCompatVer",
@@ -71,14 +60,6 @@ ext {
             timber: "com.jakewharton.timber:timber:$timberVer",
     ]
 
-    presentationDependencies = [
-            conductor          : "com.bluelinelabs:conductor:$conductorVer",
-            conductorSupport   : "com.bluelinelabs:conductor-support:$conductorVer",
-            conductorLifecycle : "com.bluelinelabs:conductor-archlifecycle:$conductorLifecycleVer",
-            lifecycleExtensions: "android.arch.lifecycle:extensions:$lifecycleVer",
-            lifecycleCompiler  : "android.arch.lifecycle:compiler:$lifecycleVer",
-    ]
-
     dataDependencies = [
             rxJava       : "io.reactivex.rxjava2:rxjava:$rxJava2Ver",
             rxAndroid    : "io.reactivex.rxjava2:rxandroid:$rxAndroid2Ver",
@@ -97,7 +78,6 @@ ext {
             testRunner        : "com.android.support.test:runner:$runnerVer",
             espressoCore      : "com.android.support.test.espresso:espresso-core:$espressoCoreVer",
             testRules         : "com.android.support.test:rules:$runnerVer",
-            supportAnnotations: "com.android.support:support-annotations:$supportLibraryVer",
-            testArchCore      : "android.arch.core:core-testing:$archComponentsVer"
+            supportAnnotations: "com.android.support:support-annotations:$supportLibraryVer"
     ]
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a189bde..5d25443 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 22 13:12:55 EEST 2018
+#Thu May 09 12:50:48 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/rxbilling/build.gradle b/rxbilling/build.gradle
index e24f067..f97fed2 100644
--- a/rxbilling/build.gradle
+++ b/rxbilling/build.gradle
@@ -47,12 +47,10 @@ dependencies {
     implementation dataDependencies.billingClient
     implementation kotlinDependencies.kotlinStdLib
 
-    compileOnly presentationDependencies.conductor
-    compileOnly presentationDependencies.lifecycleExtensions
+    compileOnly androidXdependencies.lifecycleExtensions
     compileOnly androidXdependencies.lifecycleRuntime
     compileOnly androidXdependencies.lifecycleExtensions
 
-    kapt presentationDependencies.lifecycleCompiler
     kapt androidXdependencies.lifecycleCompiler
 
     testImplementation testDependencies.jUnit
@@ -108,7 +106,7 @@ install {
 
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadoc(type: Javadoc) {
@@ -122,7 +120,7 @@ task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
 }
 
 task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
 artifacts {
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
index 7a802dd..d106b78 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
@@ -11,7 +11,6 @@ import io.reactivex.Flowable
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.subjects.PublishSubject
-import timber.log.Timber
 
 interface RxBilling : Connectable<BillingClient> {
 
@@ -27,24 +26,24 @@ interface RxBilling : Connectable<BillingClient> {
 
     fun getSubscriptionHistory(): Single<List<PurchaseHistoryRecord>>
 
-    fun getPurchaseSkuDetails(ids: List<String>): Single<List<SkuDetails>>
-
-    fun getSubscriptionSkuDetails(ids: List<String>): Single<List<SkuDetails>>
+    fun getSkuDetails(params: SkuDetailsParams): Single<List<SkuDetails>>
 
     fun launchFlow(activity: Activity, params: BillingFlowParams): Completable
 
-    fun consumeProduct(purchaseToken: String): Completable
+    fun consumeProduct(params: ConsumeParams): Completable
+
+    fun acknowledge(params: AcknowledgePurchaseParams): Completable
 
-    fun acknowledge(purchaseToken: String): Completable
+    fun loadRewarded(params: RewardLoadParams): Completable
 }
 
-class RxBillingImpl(billingFactory: BillingClientFactory)
-    : RxBilling {
+class RxBillingImpl(
+        billingFactory: BillingClientFactory
+) : RxBilling {
 
     private val updateSubject = PublishSubject.create<PurchasesUpdate>()
 
     private val updatedListener = PurchasesUpdatedListener { result, purchases ->
-        Timber.d("$result", "$purchases")
         val responseCode = result.responseCode
         val event = when (responseCode) {
             BillingClient.BillingResponseCode.OK -> PurchasesUpdate.Success(responseCode, purchases.orEmpty())
@@ -85,13 +84,22 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
         return getHistory(BillingClient.SkuType.SUBS)
     }
 
-    override fun getPurchaseSkuDetails(ids: List<String>): Single<List<SkuDetails>> {
-        return getSkuDetails(ids, BillingClient.SkuType.INAPP)
-    }
-
-
-    override fun getSubscriptionSkuDetails(ids: List<String>): Single<List<SkuDetails>> {
-        return getSkuDetails(ids, BillingClient.SkuType.SUBS)
+    override fun getSkuDetails(params: SkuDetailsParams): Single<List<SkuDetails>> {
+        return connectionFlowable
+                .flatMap { client ->
+                    Flowable.create<List<SkuDetails>>({
+                        client.querySkuDetailsAsync(params) { billingResult, skuDetailsList ->
+                            if (it.isCancelled) return@querySkuDetailsAsync
+                            val responseCode = billingResult.responseCode
+                            if (isSuccess(responseCode)) {
+                                it.onNext(skuDetailsList.orEmpty())
+                                it.onComplete()
+                            } else {
+                                it.onError(BillingException.fromResult(billingResult))
+                            }
+                        }
+                    }, BackpressureStrategy.LATEST)
+                }.firstOrError()
     }
 
     override fun launchFlow(activity: Activity, params: BillingFlowParams): Completable {
@@ -110,13 +118,10 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
                 }
     }
 
-    override fun consumeProduct(purchaseToken: String): Completable {
+    override fun consumeProduct(params : ConsumeParams): Completable {
         return connectionFlowable
                 .flatMap { client ->
                     Flowable.create<Int>({
-                        val params = ConsumeParams.newBuilder()
-                                .setPurchaseToken(purchaseToken)
-                                .build()
                         client.consumeAsync(params) { result, _ ->
                             if (it.isCancelled) return@consumeAsync
                             val responseCode = result.responseCode
@@ -130,17 +135,14 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
                     }, BackpressureStrategy.LATEST)
                 }
                 .firstOrError()
-                .toCompletable()
+                .ignoreElement()
     }
 
-    override fun acknowledge(purchaseToken: String): Completable {
+    override fun acknowledge(params: AcknowledgePurchaseParams): Completable {
         return connectionFlowable
                 .flatMap { client ->
                     Flowable.create<Int>({
-                        client.acknowledgePurchase(AcknowledgePurchaseParams.newBuilder()
-                                .setPurchaseToken(purchaseToken)
-                                .build()
-                        ) { result ->
+                        client.acknowledgePurchase(params) { result ->
                             if (it.isCancelled) return@acknowledgePurchase
                             val responseCode = result.responseCode
                             if (isSuccess(responseCode)) {
@@ -153,7 +155,26 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
                     }, BackpressureStrategy.LATEST)
                 }
                 .firstOrError()
-                .toCompletable()
+                .ignoreElement()
+    }
+
+    override fun loadRewarded(params: RewardLoadParams): Completable {
+        return connectionFlowable
+                .flatMap { client ->
+                    Flowable.create<Int>({
+                        client.loadRewardedSku(params) { result ->
+                            if (it.isCancelled) return@loadRewardedSku
+                            val responseCode = result.responseCode
+                            if (isSuccess(responseCode)) {
+                                it.onNext(result.responseCode)
+                                it.onComplete()
+                            } else {
+                                it.onError(BillingException.fromResult(result))
+                            }
+                        }
+                    }, BackpressureStrategy.LATEST)
+                }.firstOrError()
+                .ignoreElement()
     }
 
     private fun getBoughtItems(type: String): Single<List<Purchase>> {
@@ -186,28 +207,6 @@ class RxBillingImpl(billingFactory: BillingClientFactory)
                 }.firstOrError()
     }
 
-    private fun getSkuDetails(ids: List<String>, type: String): Single<List<SkuDetails>> {
-        val params = SkuDetailsParams.newBuilder()
-                .setSkusList(ids)
-                .setType(type)
-                .build()
-        return connectionFlowable
-                .flatMap { client ->
-                    Flowable.create<List<SkuDetails>>({
-                        client.querySkuDetailsAsync(params) { billingResult, skuDetailsList ->
-                            if (it.isCancelled) return@querySkuDetailsAsync
-                            val responseCode = billingResult.responseCode
-                            if (isSuccess(responseCode)) {
-                                it.onNext(skuDetailsList.orEmpty())
-                                it.onComplete()
-                            } else {
-                                it.onError(BillingException.fromResult(billingResult))
-                            }
-                        }
-                    }, BackpressureStrategy.LATEST)
-                }.firstOrError()
-    }
-
     private fun isSuccess(responseCode: Int): Boolean {
         return responseCode == BillingClient.BillingResponseCode.OK
     }
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt b/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
index 8c1c3ff..c931d02 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
@@ -53,7 +53,7 @@ class RxBillingFlow(
                     }
                 }
                 .firstOrError()
-                .toCompletable()
+                .ignoreElement()
     }
 
     fun replaceItem(request: ReplaceItemRequest, delegate: FlowDelegate): Completable {
@@ -83,7 +83,7 @@ class RxBillingFlow(
                     }
                 }
                 .firstOrError()
-                .toCompletable()
+                .ignoreElement()
     }
 
     fun handleActivityResult(activityResultCode: Int, data: Intent?): Single<Purchase> {
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/ConductorFlowDelegate.kt b/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/ConductorFlowDelegate.kt
deleted file mode 100644
index 1b62fba..0000000
--- a/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/ConductorFlowDelegate.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gen.rxbilling.flow.delegate
-
-import android.app.PendingIntent
-import android.content.Intent
-import com.bluelinelabs.conductor.Controller
-
-class ConductorFlowDelegate(private val controller: Controller) : FlowDelegate {
-
-    override fun startFlow(pendingIntent: PendingIntent, requestCode: Int) {
-        controller.startIntentSenderForResult(
-                pendingIntent.intentSender, requestCode, Intent(), 0, 0, 0, null)
-    }
-}
\ No newline at end of file
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/androidx/FragmentFlowDelegate.kt b/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/FragmentFlowDelegate.kt
similarity index 78%
rename from rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/androidx/FragmentFlowDelegate.kt
rename to rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/FragmentFlowDelegate.kt
index 6c96cea..b54b902 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/androidx/FragmentFlowDelegate.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/FragmentFlowDelegate.kt
@@ -1,8 +1,7 @@
-package com.gen.rxbilling.flow.delegate.androidx
+package com.gen.rxbilling.flow.delegate
 
 import android.app.PendingIntent
 import android.content.Intent
-import com.gen.rxbilling.flow.delegate.FlowDelegate
 
 class FragmentFlowDelegate(private val fragment: androidx.fragment.app.Fragment) : FlowDelegate {
 
@@ -10,4 +9,4 @@ class FragmentFlowDelegate(private val fragment: androidx.fragment.app.Fragment)
         fragment.startIntentSenderForResult(
                 pendingIntent.intentSender, requestCode, Intent(), 0, 0, 0, null)
     }
-}
\ No newline at end of file
+}
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/support/FragmentFlowDelegate.kt b/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/support/FragmentFlowDelegate.kt
deleted file mode 100644
index de7c7e8..0000000
--- a/rxbilling/src/main/java/com/gen/rxbilling/flow/delegate/support/FragmentFlowDelegate.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.gen.rxbilling.flow.delegate.support
-
-import android.app.PendingIntent
-import android.content.Intent
-import android.support.v4.app.Fragment
-import com.gen.rxbilling.flow.delegate.FlowDelegate
-
-class FragmentFlowDelegate(private val fragment: Fragment) : FlowDelegate {
-
-    override fun startFlow(pendingIntent: PendingIntent, requestCode: Int) {
-        fragment.startIntentSenderForResult(
-                pendingIntent.intentSender, requestCode, Intent(), 0, 0, 0, null)
-    }
-}
\ No newline at end of file
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/lifecycle/androidx/BillingConnectionManager.kt b/rxbilling/src/main/java/com/gen/rxbilling/lifecycle/BillingConnectionManager.kt
similarity index 89%
rename from rxbilling/src/main/java/com/gen/rxbilling/lifecycle/androidx/BillingConnectionManager.kt
rename to rxbilling/src/main/java/com/gen/rxbilling/lifecycle/BillingConnectionManager.kt
index 44b8e4e..c5b7559 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/lifecycle/androidx/BillingConnectionManager.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/lifecycle/BillingConnectionManager.kt
@@ -1,9 +1,8 @@
-package com.gen.rxbilling.lifecycle.androidx
+package com.gen.rxbilling.lifecycle
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import com.gen.rxbilling.lifecycle.Connectable
 import io.reactivex.disposables.Disposable
 import timber.log.Timber
 
@@ -30,4 +29,4 @@ class BillingConnectionManager<T>(
         Timber.d("disconnect")
         disposable?.dispose()
     }
-}
\ No newline at end of file
+}
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/lifecycle/arch/BillingConnectionManager.kt b/rxbilling/src/main/java/com/gen/rxbilling/lifecycle/arch/BillingConnectionManager.kt
deleted file mode 100644
index 8fe152c..0000000
--- a/rxbilling/src/main/java/com/gen/rxbilling/lifecycle/arch/BillingConnectionManager.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.gen.rxbilling.lifecycle.arch
-
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleObserver
-import android.arch.lifecycle.OnLifecycleEvent
-import com.gen.rxbilling.lifecycle.Connectable
-import io.reactivex.disposables.Disposable
-import timber.log.Timber
-
-class BillingConnectionManager<T>(
-        private val connectable: Connectable<T>
-) : LifecycleObserver {
-    private var disposable: Disposable? = null
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_START)
-    fun connect() {
-        Timber.d("connect")
-        disposable = connectable.connect()
-                .subscribe({
-                    Timber.d("$it")
-                }, {
-                    Timber.e(it)
-                }, {
-                    Timber.d("onComplete")
-                })
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    fun disconnect() {
-        Timber.d("disconnect")
-        disposable?.dispose()
-    }
-}
\ No newline at end of file

From e41655bd4df93bb438837ed7f6e050a0a0a8c7ed Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Thu, 9 May 2019 14:24:14 +0300
Subject: [PATCH 03/12] remove redundant param

---
 rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt b/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
index c931d02..8c66729 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/flow/RxBillingFlow.kt
@@ -86,7 +86,7 @@ class RxBillingFlow(
                 .ignoreElement()
     }
 
-    fun handleActivityResult(activityResultCode: Int, data: Intent?): Single<Purchase> {
+    fun handleActivityResult(data: Intent?): Single<Purchase> {
         return Single.create<Purchase> {
             if (it.isDisposed) return@create
             Timber.d("onActivityResult %s", data?.extras)

From b5af16ec62f988c9ab703cec97256987917b0c89 Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Thu, 9 May 2019 14:24:44 +0300
Subject: [PATCH 04/12] remove redundant param

---
 app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt b/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
index bd213e5..67f9e8b 100644
--- a/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
+++ b/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
@@ -70,7 +70,7 @@ class MainActivity : AppCompatActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         disposable.add(
-                rxBillingFlow.handleActivityResult(resultCode, data)
+                rxBillingFlow.handleActivityResult(data)
                         .subscribe({
                             Timber.d("onActivityResult $it")
                             tvServiceFlow.text = it.toString()

From fac8422eac639a2858d603b1eb2cbc473ad441ca Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Thu, 9 May 2019 14:31:52 +0300
Subject: [PATCH 05/12] mockito kotlin

---
 dependencies.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 77a1505..b50c827 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -32,7 +32,7 @@ ext {
     // Unit-tests
     jUnitVer = '4.12'
     mockitoVer = '2.15.0'
-    mockitoKotlinVer = '1.5.0'
+    mockitoKotlinVer = '2.1.0'
     jacocoVer = '0.1.2'
     assertJVer = '3.9.0'
 
@@ -69,7 +69,7 @@ ext {
     testDependencies = [
             jUnit        : "junit:junit:$jUnitVer",
             mockito      : "org.mockito:mockito-core:$mockitoVer",
-            mockitoKotlin: "com.nhaarman:mockito-kotlin:$mockitoKotlinVer",
+            mockitoKotlin: "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlinVer",
             assertJ      : "org.assertj:assertj-core:$assertJVer",
             mockitoInline: "org.mockito:mockito-inline:$mockitoVer"
     ]

From e32fabb08039b4b29c2e28c07032c42d350da6cb Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Tue, 14 May 2019 14:02:09 +0300
Subject: [PATCH 06/12] interface changes, readme update

---
 README.md                                     | 154 +++++++++---------
 .../com/gen/rxbilling/sample/MainActivity.kt  |  10 +-
 .../com/gen/rxbilling/client/RxBilling.kt     |  26 +--
 3 files changed, 90 insertions(+), 100 deletions(-)

diff --git a/README.md b/README.md
index 01cdedf..08d020d 100644
--- a/README.md
+++ b/README.md
@@ -90,28 +90,33 @@ The result of this operation will be delivered to your updates observer
 The result of this operation will be delivered to onActivityResult() of your Activity or Fragment,
 updates observer will not be triggered
 
-    private fun startFlowWithClient() {
-           disposable.add(rxBilling.launchFlow(this, BillingFlowParams.newBuilder()
-                   .setSku("you_id")
-                   .setType(BillingClient.SkuType.SUBS)
-                   .build())
-                   .subscribe({
-                       //flow started
-                   }, {
-                       //handle error
-                   }))
-        }
+    private fun startFlowWithService() {
+        disposable.add(
+                rxBillingFlow.buyItem(
+                        BuyItemRequest(BillingClient.SkuType.SUBS, "your_id", 101),
+                        ActivityFlowDelegate(this)
+                )
+                        .subscribe({
+                            Timber.d("flow started")
+                        }, {
+                            Timber.e(it)
+                        }))
+    }
+
 
 ## Handle Billing result with RxBillingFlow
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        disposable.add(rxBillingFlow.handleActivityResult(resultCode, data)
-                .subscribe({
-                    //handle purchase
-                }, {
-                    //handle error
-                }))
+        disposable.add(
+                rxBillingFlow.handleActivityResult(data)
+                        .subscribe({
+                            Timber.d("onActivityResult $it")
+                            tvServiceFlow.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                            tvServiceFlow.text = it.toString()
+                        }))
     }
 
 ## Load owned products
@@ -125,78 +130,73 @@ updates observer will not be triggered
                   }))
     }
 
-## Load owned subscriptions
+## Load owned purchases
 
-    private fun loadSubscriptions() {
-        disposable.add(rxBilling.getSubscriptions()
-                .subscribe({
-                    //handle purchases
-                }, {
-                   //handle error
-                }))
-    }
-
-## Load products history
-
-    private fun loadPurchasesHistory() {
-        disposable.add(rxBilling.getPurchaseHistory()
-                .subscribe({
-                    //handle purchases
-                }, {
-                    //handle error
-                }))
-    }
-
-## Load subscriptions history
-
-    private fun loadPurchasesHistory() {
-        disposable.add(rxBilling.getSubscriptionHistory()
-                .subscribe({
-                    //handle purchases
-                }, {
-                    //handle error
-                }))
+    private fun loadPurchases() {
+        disposable.add(
+                rxBilling.getPurchases(BillingClient.SkuType.SUBS)
+                        .subscribe({
+                            Timber.d("getPurchases $it")
+                            tvPurchases.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 
-## Load product sku details
+## Load history
 
-    private fun loadPurchasesHistory() {
-        disposable.add(rxBilling.getPurchaseSkuDetails(listOf("your_id1", "your_id2"))
-                .subscribe({
-                    //handle details
-                }, {
-                     //handle details
-                }))
+    private fun loadHistory() {
+        disposable.add(
+                rxBilling.getPurchaseHistory(BillingClient.SkuType.SUBS)
+                        .subscribe({
+                            Timber.d("getPurchaseHistory $it")
+                            tvHistory.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 
-## Load subscription sku details
+## Load sku details
 
     private fun loadDetails() {
-        disposable.add(rxBilling.getSubscriptionSkuDetails(listOf("your_id1", "your_id2"))
-                .subscribe({
-                    //handle details
-                }, {
-                    //handle details
-                }))
+        disposable.add(
+                rxBilling.getSkuDetails(
+                        SkuDetailsParams.newBuilder()
+                                .setSkusList(listOf("your_id1", "your_id2"))
+                                .setType(BillingClient.SkuType.SUBS)
+                                .build())
+                        .subscribe({
+                            Timber.d("loadDetails $it")
+                            tvDetails.text = it.toString()
+                        }, {
+                            Timber.e(it)
+                        }))
     }
 
 ## Consume  product
 
     private fun consume() {
-        disposable.add(rxBilling.consumeProduct("purchase_token")
-                .subscribe({
-                    //completed
-                }, {
-                    //handle error
-                }))
+        disposable.add(
+                rxBilling.consumeProduct(
+                        ConsumeParams.newBuilder()
+                                .setPurchaseToken("token")
+                                .build())
+                        .subscribe()
+        )
     }
-
-## AndroidX
-
-If you are going to migrate on AndroidX, please use
-
-    com.gen.rxbilling.lifecycle.androidx.BillingConnectionManager
     
-and 
-
-    com.gen.rxbilling.flow.delegate.androidx.FragmentFlowDelegate
\ No newline at end of file
+## Acknowledge item
+    
+    private fun acknowledge() {
+        disposable.add(
+                rxBilling.acknowledge(
+                        AcknowledgePurchaseParams.newBuilder()
+                                .setPurchaseToken("token")
+                                .setDeveloperPayload("payload")
+                                .build())
+                        .subscribe({
+                            Timber.d("acknowledge success")
+                        }, {
+                            Timber.e(it)
+                        }))
+    }
diff --git a/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt b/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
index 67f9e8b..c64e894 100644
--- a/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
+++ b/app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt
@@ -82,8 +82,10 @@ class MainActivity : AppCompatActivity() {
 
     private fun startFlowWithService() {
         disposable.add(
-                rxBillingFlow.buyItem(BuyItemRequest(BillingClient.SkuType.SUBS, "your_id", 101),
-                        ActivityFlowDelegate(this))
+                rxBillingFlow.buyItem(
+                        BuyItemRequest(BillingClient.SkuType.SUBS, "your_id", 101),
+                        ActivityFlowDelegate(this)
+                )
                         .subscribe({
                             Timber.d("flow started")
                         }, {
@@ -105,7 +107,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun loadPurchases() {
         disposable.add(
-                rxBilling.getPurchases()
+                rxBilling.getPurchases(BillingClient.SkuType.SUBS)
                         .subscribe({
                             Timber.d("getPurchases $it")
                             tvPurchases.text = it.toString()
@@ -116,7 +118,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun loadHistory() {
         disposable.add(
-                rxBilling.getPurchaseHistory()
+                rxBilling.getPurchaseHistory(BillingClient.SkuType.SUBS)
                         .subscribe({
                             Timber.d("getPurchaseHistory $it")
                             tvHistory.text = it.toString()
diff --git a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
index d106b78..63d660b 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
@@ -18,13 +18,9 @@ interface RxBilling : Connectable<BillingClient> {
 
     fun observeUpdates(): Flowable<PurchasesUpdate>
 
-    fun getPurchases(): Single<List<Purchase>>
+    fun getPurchases(skuType: String): Single<List<Purchase>>
 
-    fun getSubscriptions(): Single<List<Purchase>>
-
-    fun getPurchaseHistory(): Single<List<PurchaseHistoryRecord>>
-
-    fun getSubscriptionHistory(): Single<List<PurchaseHistoryRecord>>
+    fun getPurchaseHistory(skuType: String): Single<List<PurchaseHistoryRecord>>
 
     fun getSkuDetails(params: SkuDetailsParams): Single<List<SkuDetails>>
 
@@ -68,20 +64,12 @@ class RxBillingImpl(
         }
     }
 
-    override fun getPurchases(): Single<List<Purchase>> {
-        return getBoughtItems(BillingClient.SkuType.INAPP)
-    }
-
-    override fun getSubscriptions(): Single<List<Purchase>> {
-        return getBoughtItems(BillingClient.SkuType.SUBS)
-    }
-
-    override fun getPurchaseHistory(): Single<List<PurchaseHistoryRecord>> {
-        return getHistory(BillingClient.SkuType.INAPP)
+    override fun getPurchases(skuType: String): Single<List<Purchase>> {
+        return getBoughtItems(skuType)
     }
 
-    override fun getSubscriptionHistory(): Single<List<PurchaseHistoryRecord>> {
-        return getHistory(BillingClient.SkuType.SUBS)
+    override fun getPurchaseHistory(skuType: String): Single<List<PurchaseHistoryRecord>> {
+        return getHistory(skuType)
     }
 
     override fun getSkuDetails(params: SkuDetailsParams): Single<List<SkuDetails>> {
@@ -118,7 +106,7 @@ class RxBillingImpl(
                 }
     }
 
-    override fun consumeProduct(params : ConsumeParams): Completable {
+    override fun consumeProduct(params: ConsumeParams): Completable {
         return connectionFlowable
                 .flatMap { client ->
                     Flowable.create<Int>({

From 909f2d4ef26dc0528b647cba6cd6232f78793330 Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Sun, 30 Jun 2019 14:31:31 +0300
Subject: [PATCH 07/12] gradle version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3b36b06..6f5e3c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.github.dcendents:android-maven-gradle-plugin:$maven_version"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"

From 20573ba531f7245a362a970ad92bb90bd32cda87 Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Tue, 2 Jul 2019 18:10:32 +0300
Subject: [PATCH 08/12] libs update

---
 build.gradle                             | 15 ++++++++++++---
 dependencies.gradle                      | 20 +++++++++-----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6f5e3c9..2090d5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: 'dependencies.gradle'
+apply plugin: "com.hellofresh.gradle.deblibs"
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
-    ext.maven_version = '1.5'
-    ext.bintray_version = '1.7.2'
+    ext.kotlin_version = '1.3.40'
+    ext.maven_version = '2.1'
+    ext.bintray_version = '1.8.4'
     ext.dokka_version = '0.9.16'
     repositories {
+        maven { url 'https://plugins.gradle.org/m2/' }
         google()
         jcenter()
     }
@@ -16,6 +18,7 @@ buildscript {
         classpath "com.github.dcendents:android-maven-gradle-plugin:$maven_version"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version"
+        classpath "com.hellofresh.gradle:deblibs:2.0.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -32,3 +35,9 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+deblibs {
+    projectName = "RxBilling"
+    slackToken = ""
+    slackChannel = ""
+}
diff --git a/dependencies.gradle b/dependencies.gradle
index b50c827..fa2b803 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -7,12 +7,11 @@ ext {
     versionName = '2.0.0'
 
     // Kotlin
-    kotlinVer = '1.3.31'
-    androidKtxVer = '1.0.1'
+    kotlinVer = '1.3.40'
+    androidKtxVer = '1.0.2'
 
     // Support library
-    supportLibraryVer = '28.0.0-alpha1'
-    constraintLayout = '1.0.2'
+    constraintLayout = '1.1.3'
 
     // AndroidX
     xAppCompatVer = '1.1.0-alpha05'
@@ -20,25 +19,25 @@ ext {
     xFragmentVer = '1.1.0-alpha08'
 
     // Reactive Extensions
-    rxJava2Ver = '2.2.8'
+    rxJava2Ver = '2.2.10'
     rxAndroid2Ver = '2.1.1'
 
     // Billing Client
-    billingClientVer = '2.0.0'
+    billingClientVer = '2.0.1'
 
     // Developer-related
     timberVer = '4.7.1'
 
     // Unit-tests
     jUnitVer = '4.12'
-    mockitoVer = '2.15.0'
+    mockitoVer = '2.28.2'
     mockitoKotlinVer = '2.1.0'
     jacocoVer = '0.1.2'
     assertJVer = '3.9.0'
 
     // Instrumentation tests
-    runnerVer = '1.0.1'
-    espressoCoreVer = '3.0.1'
+    runnerVer = '1.0.2'
+    espressoCoreVer = '3.0.2'
 
     // Dependencies
 
@@ -77,7 +76,6 @@ ext {
     androidTestDependencies = [
             testRunner        : "com.android.support.test:runner:$runnerVer",
             espressoCore      : "com.android.support.test.espresso:espresso-core:$espressoCoreVer",
-            testRules         : "com.android.support.test:rules:$runnerVer",
-            supportAnnotations: "com.android.support:support-annotations:$supportLibraryVer"
+            testRules         : "com.android.support.test:rules:$runnerVer"
     ]
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5d25443..1021b5a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip

From 623a75921822cdc4d6cd61836068ddbc293bab97 Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Fri, 5 Jul 2019 15:55:42 +0300
Subject: [PATCH 09/12] dependencies fix

---
 app/build.gradle       | 6 +++---
 dependencies.gradle    | 2 +-
 rxbilling/build.gradle | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f809c08..ffbf861 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,12 +35,12 @@ dependencies {
 
     implementation kotlinDependencies.kotlinStdLib
     implementation dataDependencies.billingClient
-    implementation androidXdependencies.lifecycleExtensions
-    kapt androidXdependencies.lifecycleCompiler
+    implementation presentationDependencies.lifecycleExtensions
+    kapt presentationDependencies.lifecycleCompiler
     implementation developmentDependencies.timber
     implementation dataDependencies.rxJava
     implementation dataDependencies.rxAndroid
-    implementation androidXdependencies.appCompat
+    implementation presentationDependencies.appCompat
 
     testImplementation testDependencies.jUnit
     testImplementation testDependencies.mockito
diff --git a/dependencies.gradle b/dependencies.gradle
index fa2b803..3e14ec6 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -41,7 +41,7 @@ ext {
 
     // Dependencies
 
-    androidXdependencies = [
+    presentationDependencies = [
             appCompat          : "androidx.appcompat:appcompat:$xAppCompatVer",
             fragment           : "androidx.fragment:fragment:$xFragmentVer",
             lifecycleRuntime   : "androidx.lifecycle:lifecycle-runtime:$xLifecycleVer",
diff --git a/rxbilling/build.gradle b/rxbilling/build.gradle
index f97fed2..f0dd8e5 100644
--- a/rxbilling/build.gradle
+++ b/rxbilling/build.gradle
@@ -47,11 +47,11 @@ dependencies {
     implementation dataDependencies.billingClient
     implementation kotlinDependencies.kotlinStdLib
 
-    compileOnly androidXdependencies.lifecycleExtensions
-    compileOnly androidXdependencies.lifecycleRuntime
-    compileOnly androidXdependencies.lifecycleExtensions
+    compileOnly presentationDependencies.lifecycleExtensions
+    compileOnly presentationDependencies.lifecycleRuntime
+    compileOnly presentationDependencies.lifecycleExtensions
 
-    kapt androidXdependencies.lifecycleCompiler
+    kapt presentationDependencies.lifecycleCompiler
 
     testImplementation testDependencies.jUnit
     testImplementation testDependencies.mockito

From 9c2eefc6bb0faf1d3473d15357980c59ab752c6e Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Fri, 5 Jul 2019 16:00:50 +0300
Subject: [PATCH 10/12] remove unused dependencies

---
 app/build.gradle       |  2 --
 dependencies.gradle    | 10 ----------
 rxbilling/build.gradle |  2 --
 3 files changed, 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ffbf861..9d6ec54 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,6 +46,4 @@ dependencies {
     testImplementation testDependencies.mockito
     testImplementation testDependencies.mockitoKotlin
 
-    androidTestImplementation androidTestDependencies.testRunner
-    androidTestImplementation androidTestDependencies.espressoCore
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index 3e14ec6..d330eeb 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -35,10 +35,6 @@ ext {
     jacocoVer = '0.1.2'
     assertJVer = '3.9.0'
 
-    // Instrumentation tests
-    runnerVer = '1.0.2'
-    espressoCoreVer = '3.0.2'
-
     // Dependencies
 
     presentationDependencies = [
@@ -72,10 +68,4 @@ ext {
             assertJ      : "org.assertj:assertj-core:$assertJVer",
             mockitoInline: "org.mockito:mockito-inline:$mockitoVer"
     ]
-
-    androidTestDependencies = [
-            testRunner        : "com.android.support.test:runner:$runnerVer",
-            espressoCore      : "com.android.support.test.espresso:espresso-core:$espressoCoreVer",
-            testRules         : "com.android.support.test:rules:$runnerVer"
-    ]
 }
diff --git a/rxbilling/build.gradle b/rxbilling/build.gradle
index f0dd8e5..a95888e 100644
--- a/rxbilling/build.gradle
+++ b/rxbilling/build.gradle
@@ -57,8 +57,6 @@ dependencies {
     testImplementation testDependencies.mockito
     testImplementation testDependencies.mockitoKotlin
 
-    androidTestImplementation androidTestDependencies.testRunner
-    androidTestImplementation androidTestDependencies.espressoCore
 }
 
 def siteUrl = 'https://github.com/betterme-dev/RxBilling'      // Homepage URL of the library

From 130e780bb5d5aa545e605961dba1245e897a384c Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Mon, 8 Jul 2019 23:33:23 +0300
Subject: [PATCH 11/12] sku type annotation added

---
 .../java/com/gen/rxbilling/client/RxBilling.kt    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
index 63d660b..d2c0958 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
@@ -18,9 +18,9 @@ interface RxBilling : Connectable<BillingClient> {
 
     fun observeUpdates(): Flowable<PurchasesUpdate>
 
-    fun getPurchases(skuType: String): Single<List<Purchase>>
+    fun getPurchases(@BillingClient.SkuType skuType: String): Single<List<Purchase>>
 
-    fun getPurchaseHistory(skuType: String): Single<List<PurchaseHistoryRecord>>
+    fun getPurchaseHistory(@BillingClient.SkuType skuType: String): Single<List<PurchaseHistoryRecord>>
 
     fun getSkuDetails(params: SkuDetailsParams): Single<List<SkuDetails>>
 
@@ -40,8 +40,7 @@ class RxBillingImpl(
     private val updateSubject = PublishSubject.create<PurchasesUpdate>()
 
     private val updatedListener = PurchasesUpdatedListener { result, purchases ->
-        val responseCode = result.responseCode
-        val event = when (responseCode) {
+        val event = when (val responseCode = result.responseCode) {
             BillingClient.BillingResponseCode.OK -> PurchasesUpdate.Success(responseCode, purchases.orEmpty())
             BillingClient.BillingResponseCode.USER_CANCELED -> PurchasesUpdate.Canceled(responseCode, purchases.orEmpty())
             else -> PurchasesUpdate.Failed(responseCode, purchases.orEmpty())
@@ -64,11 +63,11 @@ class RxBillingImpl(
         }
     }
 
-    override fun getPurchases(skuType: String): Single<List<Purchase>> {
+    override fun getPurchases(@BillingClient.SkuType skuType: String): Single<List<Purchase>> {
         return getBoughtItems(skuType)
     }
 
-    override fun getPurchaseHistory(skuType: String): Single<List<PurchaseHistoryRecord>> {
+    override fun getPurchaseHistory(@BillingClient.SkuType skuType: String): Single<List<PurchaseHistoryRecord>> {
         return getHistory(skuType)
     }
 
@@ -165,7 +164,7 @@ class RxBillingImpl(
                 .ignoreElement()
     }
 
-    private fun getBoughtItems(type: String): Single<List<Purchase>> {
+    private fun getBoughtItems(@BillingClient.SkuType type: String): Single<List<Purchase>> {
         return connectionFlowable
                 .flatMap {
                     val purchasesResult = it.queryPurchases(type)
@@ -177,7 +176,7 @@ class RxBillingImpl(
                 }.firstOrError()
     }
 
-    private fun getHistory(type: String): Single<List<PurchaseHistoryRecord>> {
+    private fun getHistory(@BillingClient.SkuType type: String): Single<List<PurchaseHistoryRecord>> {
         return connectionFlowable
                 .flatMap { client ->
                     Flowable.create<List<PurchaseHistoryRecord>>({

From 3f3e8c6c9a8f63023093626b5382f9a7ce9538ef Mon Sep 17 00:00:00 2001
From: Dmytro Ostapovets <dmytro.ostapovets@gen.tech>
Date: Tue, 9 Jul 2019 00:31:02 +0300
Subject: [PATCH 12/12] change Flowable to Single

---
 .../com/gen/rxbilling/client/RxBilling.kt     | 66 +++++++++----------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
index d2c0958..a8ac28c 100644
--- a/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
+++ b/rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt
@@ -73,19 +73,18 @@ class RxBillingImpl(
 
     override fun getSkuDetails(params: SkuDetailsParams): Single<List<SkuDetails>> {
         return connectionFlowable
-                .flatMap { client ->
-                    Flowable.create<List<SkuDetails>>({
+                .flatMapSingle { client ->
+                    Single.create<List<SkuDetails>> {
                         client.querySkuDetailsAsync(params) { billingResult, skuDetailsList ->
-                            if (it.isCancelled) return@querySkuDetailsAsync
+                            if (it.isDisposed) return@querySkuDetailsAsync
                             val responseCode = billingResult.responseCode
                             if (isSuccess(responseCode)) {
-                                it.onNext(skuDetailsList.orEmpty())
-                                it.onComplete()
+                                it.onSuccess(skuDetailsList.orEmpty())
                             } else {
                                 it.onError(BillingException.fromResult(billingResult))
                             }
                         }
-                    }, BackpressureStrategy.LATEST)
+                    }
                 }.firstOrError()
     }
 
@@ -107,19 +106,18 @@ class RxBillingImpl(
 
     override fun consumeProduct(params: ConsumeParams): Completable {
         return connectionFlowable
-                .flatMap { client ->
-                    Flowable.create<Int>({
+                .flatMapSingle { client ->
+                    Single.create<Int> {
                         client.consumeAsync(params) { result, _ ->
-                            if (it.isCancelled) return@consumeAsync
+                            if (it.isDisposed) return@consumeAsync
                             val responseCode = result.responseCode
                             if (isSuccess(responseCode)) {
-                                it.onNext(responseCode)
-                                it.onComplete()
+                                it.onSuccess(responseCode)
                             } else {
                                 it.onError(BillingException.fromResult(result))
                             }
                         }
-                    }, BackpressureStrategy.LATEST)
+                    }
                 }
                 .firstOrError()
                 .ignoreElement()
@@ -127,19 +125,18 @@ class RxBillingImpl(
 
     override fun acknowledge(params: AcknowledgePurchaseParams): Completable {
         return connectionFlowable
-                .flatMap { client ->
-                    Flowable.create<Int>({
+                .flatMapSingle { client ->
+                    Single.create<Int> {
                         client.acknowledgePurchase(params) { result ->
-                            if (it.isCancelled) return@acknowledgePurchase
+                            if (it.isDisposed) return@acknowledgePurchase
                             val responseCode = result.responseCode
                             if (isSuccess(responseCode)) {
-                                it.onNext(responseCode)
-                                it.onComplete()
+                                it.onSuccess(responseCode)
                             } else {
                                 it.onError(BillingException.fromResult(result))
                             }
                         }
-                    }, BackpressureStrategy.LATEST)
+                    }
                 }
                 .firstOrError()
                 .ignoreElement()
@@ -147,50 +144,49 @@ class RxBillingImpl(
 
     override fun loadRewarded(params: RewardLoadParams): Completable {
         return connectionFlowable
-                .flatMap { client ->
-                    Flowable.create<Int>({
+                .flatMapSingle { client ->
+                    Single.create<Int> {
                         client.loadRewardedSku(params) { result ->
-                            if (it.isCancelled) return@loadRewardedSku
+                            if (it.isDisposed) return@loadRewardedSku
                             val responseCode = result.responseCode
                             if (isSuccess(responseCode)) {
-                                it.onNext(result.responseCode)
-                                it.onComplete()
+                                it.onSuccess(result.responseCode)
                             } else {
                                 it.onError(BillingException.fromResult(result))
                             }
                         }
-                    }, BackpressureStrategy.LATEST)
-                }.firstOrError()
+                    }
+                }
+                .firstOrError()
                 .ignoreElement()
     }
 
     private fun getBoughtItems(@BillingClient.SkuType type: String): Single<List<Purchase>> {
         return connectionFlowable
-                .flatMap {
+                .flatMapSingle {
                     val purchasesResult = it.queryPurchases(type)
-                    return@flatMap if (isSuccess(purchasesResult.responseCode)) {
-                        Flowable.just(purchasesResult.purchasesList.orEmpty())
+                    return@flatMapSingle if (isSuccess(purchasesResult.responseCode)) {
+                        Single.just(purchasesResult.purchasesList.orEmpty())
                     } else {
-                        Flowable.error<List<Purchase>>(BillingException.fromResult(purchasesResult.billingResult))
+                        Single.error(BillingException.fromResult(purchasesResult.billingResult))
                     }
                 }.firstOrError()
     }
 
     private fun getHistory(@BillingClient.SkuType type: String): Single<List<PurchaseHistoryRecord>> {
         return connectionFlowable
-                .flatMap { client ->
-                    Flowable.create<List<PurchaseHistoryRecord>>({
+                .flatMapSingle { client ->
+                    Single.create<List<PurchaseHistoryRecord>> {
                         client.queryPurchaseHistoryAsync(type) { billingResult: BillingResult, list: MutableList<PurchaseHistoryRecord>? ->
-                            if (it.isCancelled) return@queryPurchaseHistoryAsync
+                            if (it.isDisposed) return@queryPurchaseHistoryAsync
                             val responseCode = billingResult.responseCode
                             if (isSuccess(responseCode)) {
-                                it.onNext(list.orEmpty())
-                                it.onComplete()
+                                it.onSuccess(list.orEmpty())
                             } else {
                                 it.onError(BillingException.fromResult(billingResult))
                             }
                         }
-                    }, BackpressureStrategy.LATEST)
+                    }
                 }.firstOrError()
     }