diff --git a/presentation/src/main/java/common/util/BillingManager.kt b/presentation/src/main/java/common/util/BillingManager.kt index 430f44ae..eab78cdf 100644 --- a/presentation/src/main/java/common/util/BillingManager.kt +++ b/presentation/src/main/java/common/util/BillingManager.kt @@ -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> = BehaviorSubject.create() - val plusStatus: Observable + val upgradeStatus: Observable private val skus = listOf(SKU_PLUS, SKU_PLUS_DONATE) - private val purchaseList = mutableListOf() - private val purchaseListObservable: Observable> = BehaviorSubject.createDefault(listOf()) + private val purchaseListObservable = BehaviorSubject.createDefault>(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?) { - 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()) } } diff --git a/presentation/src/main/java/feature/plus/PlusActivity.kt b/presentation/src/main/java/feature/plus/PlusActivity.kt index 4bfff87b..bb4d6c1a 100644 --- a/presentation/src/main/java/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/feature/plus/PlusActivity.kt @@ -92,8 +92,8 @@ class PlusActivity : QkThemedActivity(), 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) { diff --git a/presentation/src/main/java/feature/plus/PlusState.kt b/presentation/src/main/java/feature/plus/PlusState.kt index b1d0d15a..861c499b 100644 --- a/presentation/src/main/java/feature/plus/PlusState.kt +++ b/presentation/src/main/java/feature/plus/PlusState.kt @@ -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 = "" diff --git a/presentation/src/main/java/feature/plus/PlusViewModel.kt b/presentation/src/main/java/feature/plus/PlusViewModel.kt index 77979df2..adafc964 100644 --- a/presentation/src/main/java/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/feature/plus/PlusViewModel.kt @@ -36,10 +36,8 @@ class PlusViewModel : QkViewModel(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 -> diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt index 3fce36b8..dba09ad9 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -164,8 +164,8 @@ class SettingsViewModel : QkViewModel(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) diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt b/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt index 082a3612..1952f155 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt @@ -78,8 +78,8 @@ class ThemePickerViewModel(intent: Intent) : QkViewModel color }) - .withLatestFrom(billingManager.plusStatus, { color, upgradeStatus -> - if (upgradeStatus == BillingManager.UpgradeStatus.REGULAR) { + .withLatestFrom(billingManager.upgradeStatus, { color, upgraded -> + if (!upgraded) { view.showQksmsPlusSnackbar() } else { theme.set(color)