Simplify usage of BillingManager

This commit is contained in:
Moez Bhatti
2018-04-16 18:44:52 -04:00
parent 29c0885131
commit 38891c04bf
6 changed files with 22 additions and 40 deletions
@@ -29,6 +29,7 @@ import com.android.billingclient.api.Purchase
import com.android.billingclient.api.PurchasesUpdatedListener
import com.android.billingclient.api.SkuDetails
import com.android.billingclient.api.SkuDetailsParams
import com.moez.QKSMS.BuildConfig
import io.reactivex.Observable
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
@@ -40,19 +41,16 @@ class BillingManager @Inject constructor(
private val analyticsManager: AnalyticsManager
) : PurchasesUpdatedListener {
enum class UpgradeStatus { REGULAR, UPGRADED }
companion object {
const val SKU_PLUS = "remove_ads"
const val SKU_PLUS_DONATE = "qksms_plus_donate"
}
val products: Observable<List<SkuDetails>> = BehaviorSubject.create()
val plusStatus: Observable<UpgradeStatus>
val upgradeStatus: Observable<Boolean>
private val skus = listOf(SKU_PLUS, SKU_PLUS_DONATE)
private val purchaseList = mutableListOf<Purchase>()
private val purchaseListObservable: Observable<List<Purchase>> = BehaviorSubject.createDefault(listOf())
private val purchaseListObservable = BehaviorSubject.createDefault<List<Purchase>>(listOf())
private val billingClient: BillingClient = BillingClient.newBuilder(context).setListener(this).build()
private var isServiceConnected = false
@@ -63,15 +61,13 @@ class BillingManager @Inject constructor(
querySkuDetailsAsync()
}
plusStatus = purchaseListObservable
.map { purchases ->
when {
purchases.any { it.sku == SKU_PLUS } -> UpgradeStatus.UPGRADED
purchases.any { it.sku == SKU_PLUS_DONATE } -> UpgradeStatus.UPGRADED
else -> UpgradeStatus.REGULAR
}
}
.doOnNext { upgraded -> analyticsManager.setUserProperty("Upgraded", upgraded.toString()) }
upgradeStatus = when (BuildConfig.FLAVOR) {
"noAnalytics" -> BehaviorSubject.createDefault(true)
else -> purchaseListObservable
.map { purchases -> purchases.any { it.sku == SKU_PLUS } || purchases.any { it.sku == SKU_PLUS_DONATE } }
.doOnNext { upgraded -> analyticsManager.setUserProperty("Upgraded", upgraded) }
}
}
private fun queryPurchases() {
@@ -79,9 +75,7 @@ class BillingManager @Inject constructor(
val purchasesResult = billingClient.queryPurchases(SkuType.INAPP)
// Handle purchase result
purchaseList.clear()
purchaseList.addAll(purchasesResult.purchasesList.orEmpty())
(this.purchaseListObservable as Subject).onNext(purchaseList)
purchaseListObservable.onNext(purchasesResult.purchasesList.orEmpty())
}
}
@@ -127,16 +121,8 @@ class BillingManager @Inject constructor(
}
override fun onPurchasesUpdated(resultCode: Int, purchases: List<Purchase>?) {
when (resultCode) {
BillingResponse.OK -> {
purchaseList.clear()
purchases?.let { purchaseList.addAll(it) }
(this.purchaseListObservable as Subject).onNext(purchaseList)
}
else -> {
// Ignored
}
if (resultCode == BillingResponse.OK) {
purchaseListObservable.onNext(purchases.orEmpty())
}
}
@@ -92,8 +92,8 @@ class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
upgrade.text = getString(R.string.qksms_plus_upgrade, state.upgradePrice, state.currency)
upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
toUpgrade.setVisible(state.currentPlan == BillingManager.UpgradeStatus.REGULAR)
upgraded.setVisible(state.currentPlan == BillingManager.UpgradeStatus.UPGRADED)
toUpgrade.setVisible(!state.upgraded)
upgraded.setVisible(state.upgraded)
}
override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) {
@@ -18,10 +18,8 @@
*/
package feature.plus
import common.util.BillingManager
data class PlusState(
val currentPlan: BillingManager.UpgradeStatus = BillingManager.UpgradeStatus.REGULAR,
val upgraded: Boolean = false,
val upgradePrice: String = "",
val upgradeDonatePrice: String = "",
val currency: String = ""
@@ -36,10 +36,8 @@ class PlusViewModel : QkViewModel<PlusView, PlusState>(PlusState()) {
init {
appComponent.inject(this)
disposables += billingManager.plusStatus
.subscribe { plan ->
newState { it.copy(currentPlan = plan) }
}
disposables += billingManager.upgradeStatus
.subscribe { upgraded -> newState { it.copy(upgraded = upgraded) } }
disposables += billingManager.products
.subscribe { products ->
@@ -164,8 +164,8 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
view.nightModeSelectedIntent
.doOnNext { view.dismissNightModeDialog() }
.withLatestFrom(billingManager.plusStatus, { mode, plusStatus ->
if (plusStatus == BillingManager.UpgradeStatus.REGULAR && mode == Preferences.NIGHT_MODE_AUTO) {
.withLatestFrom(billingManager.upgradeStatus, { mode, upgraded ->
if (!upgraded && mode == Preferences.NIGHT_MODE_AUTO) {
view.showQksmsPlusSnackbar()
} else {
nightModeManager.updateNightMode(mode)
@@ -78,8 +78,8 @@ class ThemePickerViewModel(intent: Intent) : QkViewModel<ThemePickerView, ThemeP
// Update the theme, when apply is clicked
view.hsvThemeAppliedIntent
.withLatestFrom(view.hsvThemeSelectedIntent, { _, color -> color })
.withLatestFrom(billingManager.plusStatus, { color, upgradeStatus ->
if (upgradeStatus == BillingManager.UpgradeStatus.REGULAR) {
.withLatestFrom(billingManager.upgradeStatus, { color, upgraded ->
if (!upgraded) {
view.showQksmsPlusSnackbar()
} else {
theme.set(color)