Avoid creating threads when dispatching tasks

purchases/src/main/kotlin/com/revenuecat/purchases/PurchasesFactory.kt

@@ -85,9 +85,15 @@ internal class PurchasesFactory(
 
             val eTagManager = ETagManager(context)
 
-            val dispatcher = Dispatcher(createDefaultExecutor(), runningIntegrationTests)
-            val backendDispatcher = Dispatcher(service ?: createDefaultExecutor(), runningIntegrationTests)
-            val eventsDispatcher = Dispatcher(createEventsExecutor(), runningIntegrationTests)
+            val dispatcher = Dispatcher(createDefaultExecutor(), runningIntegrationTests = runningIntegrationTests)
+            val backendDispatcher = Dispatcher(
+                service ?: createDefaultExecutor(),
+                runningIntegrationTests = runningIntegrationTests,
+            )
+            val eventsDispatcher = Dispatcher(
+                createEventsExecutor(),
+                runningIntegrationTests = runningIntegrationTests,
+            )
 
             var diagnosticsFileHelper: DiagnosticsFileHelper? = null
             var diagnosticsTracker: DiagnosticsTracker? = null

purchases/src/main/kotlin/com/revenuecat/purchases/common/Dispatcher.kt

@@ -5,6 +5,8 @@
 
 package com.revenuecat.purchases.common
 
+import android.os.Handler
+import android.os.Looper
 import com.revenuecat.purchases.PurchasesError
 import com.revenuecat.purchases.common.networking.HTTPResult
 import com.revenuecat.purchases.common.verification.SignatureVerificationException
@@ -24,6 +26,7 @@
 
 internal open class Dispatcher(
     private val executorService: ExecutorService,
+    private val mainHandler: Handler? = Handler(Looper.getMainLooper()),
     private val runningIntegrationTests: Boolean = false,
 ) {
     private companion object {
@@ -59,28 +62,25 @@
     ) {
         synchronized(this.executorService) {
             if (!executorService.isShutdown) {
-                val future = if (delay != Delay.NONE && executorService is ScheduledExecutorService) {
+                val commandHandlingExceptions = Runnable {
+                    try {
+                        command.run()
+                    } catch (@Suppress("TooGenericExceptionCaught") e: Exception) {
+                        errorLog("Exception running command: $e")
+                        mainHandler?.post {
+                            throw e.cause ?: e
+                        }
+                    }
+                }
+                if (delay != Delay.NONE && executorService is ScheduledExecutorService) {
                     var delayToApply = (delay.minDelay.inWholeMilliseconds..delay.maxDelay.inWholeMilliseconds).random()
                     if (runningIntegrationTests) {
                         delayToApply = (delayToApply * INTEGRATION_TEST_DELAY_PERCENTAGE).toLong()
                     }
-                    executorService.schedule(command, delayToApply, TimeUnit.MILLISECONDS)
+                    executorService.schedule(commandHandlingExceptions, delayToApply, TimeUnit.MILLISECONDS)
                 } else {
-                    executorService.submit(command)
+                    executorService.submit(commandHandlingExceptions)
                 }
-
-                // Exceptions are being swallowed if using execute instead of submit
-                // Future.get is blocking so we create a Thread
-                // More info: https://github.com/RevenueCat/purchases-android/pull/234
-                Thread {
-                    try {
-                        future.get()
-                    } catch (e: InterruptedException) {
-                        Thread.currentThread().interrupt()
-                    } catch (@Suppress("TooGenericExceptionCaught") e: Exception) {
-                        e.cause?.let { throw it }
-                    }
-                }.start()
             }
         }
     }

purchases/src/test/java/com/revenuecat/purchases/utils/SyncDispatcher.kt

@@ -5,7 +5,7 @@ import com.revenuecat.purchases.common.Dispatcher
 import io.mockk.mockk
 import java.util.concurrent.RejectedExecutionException
 
-internal class SyncDispatcher : Dispatcher(mockk()) {
+internal class SyncDispatcher : Dispatcher(mockk(), MockHandlerFactory.createMockHandler()) {
 
     private var closed = false