Fix issue with billing upgrade

b-lam · Feb 13, 2023 · 483ab9c · 483ab9c
1 parent 4b71c87
commit 483ab9c
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 76 deletions.
diff --git a/app/src/main/java/com/b_lam/resplash/domain/billing/BillingRepository.kt b/app/src/main/java/com/b_lam/resplash/domain/billing/BillingRepository.kt
@@ -58,44 +58,34 @@ class BillingRepository(
         localCacheBillingClient.entitlementsDao().getResplashPro()
     }
 
-    fun launchBillingFlow(activity: Activity, productDetails: ProductDetails) {
-        val params = BillingFlowParams.newBuilder()
-            .setProductDetailsParamsList(
-                listOf(
-                    BillingFlowParams.ProductDetailsParams.newBuilder()
-                        .setProductDetails(productDetails)
-                        .build()
-                )
-            )
-            .build()
-        billingClient.launchBillingFlow(activity, params)
+    init {
+        startDataSourceConnections()
     }
 
-    fun startDataSourceConnections() {
+    private fun startDataSourceConnections() {
+        debug("startDataSourceConnections")
         instantiateAndConnectToPlayBillingService()
         localCacheBillingClient = LocalBillingDatabase.getInstance(application)
     }
 
-    fun endDataSourceConnections() {
+    // Not needed since BillingRepository should be a singleton
+    private fun endDataSourceConnections() {
+        debug("endDataSourceConnections")
         billingClient.endConnection()
     }
 
     private fun instantiateAndConnectToPlayBillingService() {
         billingClient = BillingClient.newBuilder(application.applicationContext)
             .enablePendingPurchases()
-            .setListener(this).build()
-        connectToPlayBillingService()
-    }
-
-    private fun connectToPlayBillingService(): Boolean {
+            .setListener(this)
+            .build()
         if (!billingClient.isReady) {
             billingClient.startConnection(this)
-            return true
         }
-        return false
     }
 
     override fun onBillingSetupFinished(billingResult: BillingResult) {
+        debug("onBillingSetupFinished")
         when (billingResult.responseCode) {
             BillingClient.BillingResponseCode.OK -> {
                 queryProductDetailsAsync()
@@ -112,6 +102,7 @@ class BillingRepository(
      * self-upgrades or is force closed.
      */
     override fun onBillingServiceDisconnected() {
+        debug("onBillingServiceDisconnected")
         retryBillingServiceConnectionWithExponentialBackoff()
     }
 
@@ -134,22 +125,23 @@ class BillingRepository(
         billingResult: BillingResult,
         purchases: MutableList<Purchase>?
     ) {
+        debug("onPurchasesUpdated: ${billingResult.responseCode} ${billingResult.debugMessage}")
         when (billingResult.responseCode) {
             BillingClient.BillingResponseCode.OK ->
                 purchases?.apply { processPurchases(this.toSet()) }
             BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> queryPurchasesAsync()
-            else -> debug("${billingResult.responseCode}: ${billingResult.debugMessage}")
         }
     }
 
     fun queryPurchasesAsync(restore: Boolean = false) {
+        debug("queryPurchasesAsync")
         val params = QueryPurchasesParams.newBuilder()
             .setProductType(BillingClient.ProductType.INAPP)
             .build()
         billingClient.queryPurchasesAsync(params) { billingResult, purchasesList ->
             when (billingResult.responseCode) {
                 BillingClient.BillingResponseCode.OK -> {
-                    debug("queryPurchasesAsync INAPP results: ${purchasesList.size}")
+                    debug("Inapp purchases: $purchasesList")
                     if (restore && purchasesList.isEmpty()) {
                         _billingMessageLiveData.postValue(Event("No purchases found"))
                     }
@@ -161,6 +153,7 @@ class BillingRepository(
     }
 
     private fun queryProductDetailsAsync() {
+        debug("queryProductDetailsAsync")
         val productList = INAPP_PRODUCTS.map {
             QueryProductDetailsParams.Product.newBuilder()
                 .setProductId(it)
@@ -221,6 +214,7 @@ class BillingRepository(
         }
 
     private fun handleConsumablePurchasesAsync(consumables: List<Purchase>) {
+        debug("handleConsumablePurchasesAsync")
         consumables.forEach {
             val params = ConsumeParams.newBuilder().setPurchaseToken(it.purchaseToken).build()
             billingClient.consumeAsync(params) { billingResult, _ ->
@@ -238,17 +232,20 @@ class BillingRepository(
     }
 
     private fun acknowledgeNonConsumablePurchasesAsync(nonConsumables: List<Purchase>) {
+        debug("acknowledgeNonConsumablePurchasesAsync")
         nonConsumables.forEach { purchase ->
             if (!purchase.isAcknowledged) {
                 val params = AcknowledgePurchaseParams.newBuilder()
                     .setPurchaseToken(purchase.purchaseToken)
                     .build()
                 billingClient.acknowledgePurchase(params) { billingResult ->
+                    val message = "Response code ${billingResult.responseCode}: ${billingResult.debugMessage}"
                     when (billingResult.responseCode) {
-                        BillingClient.BillingResponseCode.OK ->
+                        BillingClient.BillingResponseCode.OK -> {
+                            debug(message)
                             disburseNonConsumableEntitlement(purchase)
+                        }
                         else -> {
-                            val message = "${billingResult.responseCode}: ${billingResult.debugMessage}"
                             warn(message)
                             _billingMessageLiveData.postValue(Event(message))
                             _billingErrorLiveData.postValue(Event(billingResult))
@@ -263,6 +260,7 @@ class BillingRepository(
 
     private fun disburseConsumableEntitlements(purchase: Purchase) =
         CoroutineScope(Job() + Dispatchers.IO).launch {
+            debug("disburseConsumableEntitlements: ${purchase.products}")
             for (product in purchase.products) {
                 if (Sku.CONSUMABLE_PRODUCTS.contains(product)) {
                     when (product) {
@@ -276,15 +274,15 @@ class BillingRepository(
             _purchaseCompleteLiveData.postValue(Event(purchase))
         }
 
-    private fun disburseNonConsumableEntitlement(purchase: Purchase) {
+    private fun disburseNonConsumableEntitlement(purchase: Purchase) =
         CoroutineScope(Job() + Dispatchers.IO).launch {
+            debug("disburseNonConsumableEntitlement: ${purchase.products}")
             for (product in purchase.products) {
                 when (product) {
                     Sku.RESPLASH_PRO -> insert(ResplashPro(true))
                 }
             }
         }
-    }
 
     @WorkerThread
     suspend fun updateDonations(donation: Donation) = withContext(Dispatchers.IO) {
@@ -310,6 +308,19 @@ class BillingRepository(
         localCacheBillingClient.entitlementsDao().insert(entitlement)
     }
 
+    fun launchBillingFlow(activity: Activity, productDetails: ProductDetails) {
+        val params = BillingFlowParams.newBuilder()
+            .setProductDetailsParamsList(
+                listOf(
+                    BillingFlowParams.ProductDetailsParams.newBuilder()
+                        .setProductDetails(productDetails)
+                        .build()
+                )
+            )
+            .build()
+        billingClient.launchBillingFlow(activity, params)
+    }
+
     companion object {
         private val handler = Handler(Looper.getMainLooper())
     }

diff --git a/app/src/main/java/com/b_lam/resplash/ui/autowallpaper/AutoWallpaperSettingsViewModel.kt b/app/src/main/java/com/b_lam/resplash/ui/autowallpaper/AutoWallpaperSettingsViewModel.kt
@@ -4,17 +4,8 @@ import androidx.lifecycle.ViewModel
 import com.b_lam.resplash.domain.billing.BillingRepository
 
 class AutoWallpaperSettingsViewModel(
-    private val billingRepository: BillingRepository
+    billingRepository: BillingRepository
 ) : ViewModel() {
 
-    init {
-        billingRepository.startDataSourceConnections()
-    }
-
     val resplashProLiveData = billingRepository.resplashProLiveData
-
-    override fun onCleared() {
-        super.onCleared()
-        billingRepository.endDataSourceConnections()
-    }
-}
+}
diff --git a/app/src/main/java/com/b_lam/resplash/ui/donation/DonationViewModel.kt b/app/src/main/java/com/b_lam/resplash/ui/donation/DonationViewModel.kt
@@ -17,10 +17,6 @@ class DonationViewModel(
     private val photoRepository: PhotoRepository
 ) : ViewModel() {
 
-    init {
-        billingRepository.startDataSourceConnections()
-    }
-
     val productDetailsLiveData = billingRepository.productsWithProductDetails
 
     val purchaseCompleteLiveData = billingRepository.purchaseCompleteLiveData
@@ -38,9 +34,4 @@ class DonationViewModel(
     fun makePurchase(activity: Activity, productDetails: ProductDetails) {
         billingRepository.launchBillingFlow(activity, productDetails)
     }
-
-    override fun onCleared() {
-        super.onCleared()
-        billingRepository.endDataSourceConnections()
-    }
 }
diff --git a/app/src/main/java/com/b_lam/resplash/ui/main/MainViewModel.kt b/app/src/main/java/com/b_lam/resplash/ui/main/MainViewModel.kt
@@ -17,13 +17,9 @@ class MainViewModel(
     private val photoRepository: PhotoRepository,
     private val collectionRepository: CollectionRepository,
     private val loginRepository: LoginRepository,
-    private val billingRepository: BillingRepository
+    billingRepository: BillingRepository
 ) : ViewModel() {
 
-    init {
-        billingRepository.startDataSourceConnections()
-    }
-
     private val _navigationItemSelectedLiveData = MutableLiveData<Event<Int>>()
     val navigationItemSelectedLiveData: LiveData<Event<Int>> = _navigationItemSelectedLiveData
 
@@ -110,9 +106,4 @@ class MainViewModel(
         _emailLiveData.postValue(email)
         _profilePictureLiveData.postValue(profilePicture)
     }
-
-    override fun onCleared() {
-        super.onCleared()
-        billingRepository.endDataSourceConnections()
-    }
 }
diff --git a/app/src/main/java/com/b_lam/resplash/ui/muzei/MuzeiSettingsViewModel.kt b/app/src/main/java/com/b_lam/resplash/ui/muzei/MuzeiSettingsViewModel.kt
@@ -4,17 +4,8 @@ import androidx.lifecycle.ViewModel
 import com.b_lam.resplash.domain.billing.BillingRepository
 
 class MuzeiSettingsViewModel(
-    private val billingRepository: BillingRepository
+    billingRepository: BillingRepository
 ) : ViewModel() {
 
-    init {
-        billingRepository.startDataSourceConnections()
-    }
-
     val resplashProLiveData = billingRepository.resplashProLiveData
-
-    override fun onCleared() {
-        super.onCleared()
-        billingRepository.endDataSourceConnections()
-    }
-}
+}
diff --git a/app/src/main/java/com/b_lam/resplash/ui/upgrade/UpgradeViewModel.kt b/app/src/main/java/com/b_lam/resplash/ui/upgrade/UpgradeViewModel.kt
@@ -15,10 +15,6 @@ class UpgradeViewModel(
     private val photoRepository: PhotoRepository
 ) : ViewModel() {
 
-    init {
-        billingRepository.startDataSourceConnections()
-    }
-
     private val productDetailsLiveData = billingRepository.productsWithProductDetails
 
     val resplashProLiveData = billingRepository.resplashProLiveData
@@ -51,11 +47,6 @@ class UpgradeViewModel(
 
     fun restorePurchase() = billingRepository.queryPurchasesAsync(restore = true)
 
-    override fun onCleared() {
-        super.onCleared()
-        billingRepository.endDataSourceConnections()
-    }
-
     companion object {
 
         private const val RESPLASH_COLLECTION_ID = "10548247"