Merge pull request #1747 from Hafizzle/Fixes#1637

Fixes#1637 - Fix users unable to purchase gems because "you already own this item"

Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt

@@ -103,14 +103,7 @@ open class PurchaseHandler(
             override fun onBillingSetupFinished(billingResult: BillingResult) {
                 if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
                     billingClientState = BillingClientState.READY
-                    billingClient.queryPurchasesAsync(
-                        BillingClient.SkuType.SUBS,
-                        this@PurchaseHandler
-                    )
-                    billingClient.queryPurchasesAsync(
-                        BillingClient.SkuType.INAPP,
-                        this@PurchaseHandler
-                    )
+                    queryPurchases()
                 } else {
                     billingClientState = BillingClientState.UNAVAILABLE
                 }
@@ -126,6 +119,19 @@ open class PurchaseHandler(
         billingClient.endConnection()
     }
 
+    fun queryPurchases(){
+        if (billingClientState == BillingClientState.READY){
+            billingClient.queryPurchasesAsync(
+                BillingClient.SkuType.SUBS,
+                this@PurchaseHandler
+            )
+            billingClient.queryPurchasesAsync(
+                BillingClient.SkuType.INAPP,
+                this@PurchaseHandler
+            )
+        }
+    }
+
     suspend fun getAllGemSKUs(): List<SkuDetails> =
         getSKUs(BillingClient.SkuType.INAPP, PurchaseTypes.allGemTypes)
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt

@@ -91,6 +91,7 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
 
     override fun onResume() {
         super.onResume()
+        purchaseHandler.queryPurchases()
         loadInventory()
     }
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt

@@ -102,6 +102,7 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
 
     override fun onResume() {
         super.onResume()
+        purchaseHandler.queryPurchases()
         refresh()
         loadInventory()
     }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt

@@ -49,6 +49,8 @@ class InsufficientGemsDialog(context: Context, var gemPrice: Int) : Insufficient
         addCloseButton()
     }
 
+
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         getActivity()?.let { activity ->