Fix crash on Android in retry logic after destroy called

pubnub · Aug 16, 2024 · 75a2bbd · 75a2bbd
1 parent 973d1a0
commit 75a2bbd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/...b-core-impl/src/main/kotlin/com/pubnub/internal/presence/eventengine/effect/WaitEffect.kt b/...b-core-impl/src/main/kotlin/com/pubnub/internal/presence/eventengine/effect/WaitEffect.kt
@@ -5,6 +5,7 @@ import com.pubnub.internal.eventengine.Sink
 import com.pubnub.internal.extension.scheduleWithDelay
 import com.pubnub.internal.presence.eventengine.event.PresenceEvent
 import org.slf4j.LoggerFactory
+import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.ScheduledFuture
 import kotlin.time.Duration
@@ -29,10 +30,14 @@ internal class WaitEffect(
             return
         }
 
-        scheduled =
-            executorService.scheduleWithDelay(heartbeatInterval) {
-                presenceEventSink.add(PresenceEvent.TimesUp)
-            }
+        try {
+            scheduled =
+                executorService.scheduleWithDelay(heartbeatInterval) {
+                    presenceEventSink.add(PresenceEvent.TimesUp)
+                }
+        } catch (_: RejectedExecutionException) {
+            log.trace("Unable to schedule retry, PubNub was likely already destroyed.")
+        }
     }
 
     @Synchronized

diff --git a/pubnub-core/pubnub-core-impl/src/main/kotlin/com/pubnub/internal/retry/RetryableCallback.kt b/pubnub-core/pubnub-core-impl/src/main/kotlin/com/pubnub/internal/retry/RetryableCallback.kt
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.ScheduledExecutorService
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
@@ -82,8 +83,12 @@ internal abstract class RetryableCallback<T>(
         val effectiveDelay: Duration = delay + randomDelayInMillis.milliseconds
         log.trace("Added random delay so effective retry delay is ${effectiveDelay.inWholeMilliseconds} millis")
         // don't want to block the main thread in case of Android so using executorService
-        executorService.scheduleWithDelay(effectiveDelay) {
-            call.clone().enqueue(this)
+        try {
+            executorService.scheduleWithDelay(effectiveDelay) {
+                call.clone().enqueue(this)
+            }
+        } catch (_: RejectedExecutionException) {
+            log.trace("Unable to schedule retry, PubNub was likely already destroyed.")
         }
     }