fix: Address PR comments

-LEARNER-9845
openedx-unsupported · Feb 16, 2024 · f09bde6 · f09bde6
1 parent 49b9d4f
commit f09bde6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/dialog/CourseModalDialogFragment.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/view/dialog/CourseModalDialogFragment.kt
@@ -221,7 +221,10 @@ class CourseModalDialogFragment : DialogFragment() {
             errorMessage = errorMessage,
             retryListener = retryListener
         )
-        binding.layoutUpgradeBtn.root.setVisibility(false)
+        // Hide the upgrade button if the course SKU is not available on Play Console.
+        if (errorMessage.requestType == ErrorMessage.NO_SKU_CODE) {
+            binding.layoutUpgradeBtn.root.setVisibility(false)
+        }
     }
 
     private fun enableUpgradeButton(enable: Boolean) {

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/viewModel/InAppPurchasesViewModel.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/viewModel/InAppPurchasesViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.ProductDetails.OneTimePurchaseOfferDetails
 import com.android.billingclient.api.Purchase
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -98,27 +99,34 @@ class InAppPurchasesViewModel @Inject constructor(
         viewModelScope.launch {
             val response = billingProcessor.querySyncDetails(courseSku)
             val productDetail = response.productDetailsList?.firstOrNull()
+            val billingResult = response.billingResult
 
-            if (productDetail?.productId == courseSku) {
-                productDetail.oneTimePurchaseOfferDetails?.let {
-                    _productPrice.postEvent(it)
-                    iapAnalytics.setPrice(it.formattedPrice)
-                    iapAnalytics.trackIAPEvent(Analytics.Events.IAP_LOAD_PRICE_TIME)
-                } ?: dispatchError(
-                    requestType = ErrorMessage.PRICE_CODE,
-                    throwable = InAppPurchasesException(
-                        httpErrorCode = response.billingResult.responseCode,
-                        errorMessage = response.billingResult.debugMessage,
+            when {
+                billingResult.responseCode == BillingClient.BillingResponseCode.OK && productDetail == null -> {
+                    dispatchError(
+                        requestType = ErrorMessage.NO_SKU_CODE,
+                        throwable = InAppPurchasesException(
+                            httpErrorCode = billingResult.responseCode,
+                            errorMessage = billingResult.debugMessage
+                        )
                     )
-                )
-            } else {
-                dispatchError(
-                    requestType = ErrorMessage.NO_SKU_CODE,
-                    throwable = InAppPurchasesException(
-                        httpErrorCode = response.billingResult.responseCode,
-                        errorMessage = response.billingResult.debugMessage,
+                }
+
+                productDetail?.productId == courseSku && productDetail.oneTimePurchaseOfferDetails != null -> {
+                    _productPrice.postEvent(productDetail.oneTimePurchaseOfferDetails!!)
+                    iapAnalytics.setPrice(productDetail.oneTimePurchaseOfferDetails?.formattedPrice!!)
+                    iapAnalytics.trackIAPEvent(Analytics.Events.IAP_LOAD_PRICE_TIME)
+                }
+
+                else -> {
+                    dispatchError(
+                        requestType = ErrorMessage.PRICE_CODE,
+                        throwable = InAppPurchasesException(
+                            httpErrorCode = response.billingResult.responseCode,
+                            errorMessage = response.billingResult.debugMessage,
+                        )
                     )
-                )
+                }
             }
         }
     }

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/wrapper/InAppPurchasesDialog.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/wrapper/InAppPurchasesDialog.kt
@@ -88,7 +88,8 @@ class InAppPurchasesDialog @Inject constructor(
                 errorMsg = feedbackErrorMessage
             )
 
-            ErrorMessage.PRICE_CODE -> iapAnalytics.trackIAPEvent(
+            ErrorMessage.PRICE_CODE,
+            ErrorMessage.NO_SKU_CODE -> iapAnalytics.trackIAPEvent(
                 eventName = Analytics.Events.IAP_PRICE_LOAD_ERROR,
                 errorMsg = feedbackErrorMessage
             )