[CSDK-302] Fix: attempt to reconnect when billing response is error (#…

…558) * added a few cases where we retry connection * added test * clean up imports
RevenueCat · Jul 12, 2022 · e799c28 · e799c28
1 parent 525822b
commit e799c28
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 6 deletions.
diff --git a/feature/google/src/main/java/com/revenuecat/purchases/google/BillingWrapper.kt b/feature/google/src/main/java/com/revenuecat/purchases/google/BillingWrapper.kt
@@ -573,13 +573,19 @@ class BillingWrapper(
                         }
                     }
                 }
-                BillingClient.BillingResponseCode.SERVICE_DISCONNECTED,
-                BillingClient.BillingResponseCode.USER_CANCELED,
+                BillingClient.BillingResponseCode.SERVICE_TIMEOUT,
+                BillingClient.BillingResponseCode.ERROR,
                 BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE,
+                BillingClient.BillingResponseCode.USER_CANCELED,
+                BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> {
+                    log(
+                        LogIntent.GOOGLE_WARNING, BillingStrings.BILLING_CLIENT_ERROR
+                            .format(billingResult.toHumanReadableDescription())
+                    )
+                    retryBillingServiceConnectionWithExponentialBackoff()
+                }
                 BillingClient.BillingResponseCode.ITEM_UNAVAILABLE,
-                BillingClient.BillingResponseCode.ERROR,
                 BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED,
-                BillingClient.BillingResponseCode.SERVICE_TIMEOUT,
                 BillingClient.BillingResponseCode.ITEM_NOT_OWNED -> {
                     log(
                         LogIntent.GOOGLE_WARNING, BillingStrings.BILLING_CLIENT_ERROR

diff --git a/...testDependencies/java/com/revenuecat/purchases/google/BillingWrapperTestBillingClient4.kt b/...testDependencies/java/com/revenuecat/purchases/google/BillingWrapperTestBillingClient4.kt
@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Handler
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.revenuecat.purchases.common.firstSku
 import com.android.billingclient.api.AcknowledgePurchaseParams
 import com.android.billingclient.api.AcknowledgePurchaseResponseListener
 import com.android.billingclient.api.BillingClient
@@ -27,6 +26,7 @@ import com.revenuecat.purchases.PurchasesErrorCode
 import com.revenuecat.purchases.common.BillingAbstract
 import com.revenuecat.purchases.common.ReplaceSkuInfo
 import com.revenuecat.purchases.common.caching.DeviceCache
+import com.revenuecat.purchases.common.firstSku
 import com.revenuecat.purchases.common.sha1
 import com.revenuecat.purchases.common.sha256
 import com.revenuecat.purchases.models.StoreProduct
@@ -50,7 +50,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import java.lang.Thread.sleep
-import java.util.ArrayList
 import java.util.concurrent.CountDownLatch
 
 @RunWith(AndroidJUnit4::class)
@@ -1674,6 +1673,48 @@ class BillingWrapperTest {
         assertThat(afterSuccessfulConnectionRetryMillisecondsSlot.captured == firstRetryMillisecondsSlot.captured)
     }
 
+    @Test
+    fun `if billing setup returns recoverable error code, will try to reconnect with exponential backoff`() {
+        every {
+            handler.postDelayed(any(), any())
+        } returns true
+
+        val errorCodes = listOf(
+            BillingClient.BillingResponseCode.SERVICE_TIMEOUT,
+            BillingClient.BillingResponseCode.ERROR,
+            BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE,
+            BillingClient.BillingResponseCode.USER_CANCELED,
+            BillingClient.BillingResponseCode.SERVICE_DISCONNECTED
+        )
+        var currentCallback = 1 // we get one call before triggering it manually
+        for (errorCode in errorCodes) {
+            currentCallback += 1
+            wrapper.onBillingSetupFinished(errorCode.buildResult())
+            verify(exactly = currentCallback) { handler.postDelayed(any(), any()) }
+        }
+    }
+
+    @Test
+    fun `if billing setup returns code that doesnt merit retry, will not try to reconnect`() {
+        every {
+            handler.postDelayed(any(), any())
+        } returns true
+
+        val errorCodes = listOf(
+            BillingClient.BillingResponseCode.OK,
+            BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED,
+            BillingClient.BillingResponseCode.BILLING_UNAVAILABLE,
+            BillingClient.BillingResponseCode.ITEM_UNAVAILABLE,
+            BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED,
+            BillingClient.BillingResponseCode.ITEM_NOT_OWNED,
+            BillingClient.BillingResponseCode.DEVELOPER_ERROR
+        )
+        for (errorCode in errorCodes) {
+            wrapper.onBillingSetupFinished(errorCode.buildResult())
+        }
+        verify(exactly = 1) { handler.postDelayed(any(), any()) }
+    }
+
     @Test
     fun `setting purchasesUpdatedListener will connect to BillingService with no delay`() {
         val retryMillisecondsSlot = slot<Long>()