Fix crash on Android in retry logic after destroy called (#270)

* Fix crash on Android in retry logic after destroy called

* PubNub SDK v9.2.4 release.

---------

Co-authored-by: PubNub Release Bot <[email protected]>

Author: wkal-pubnub

.pubnub.yml

@@ -1,9 +1,9 @@
 name: kotlin
-version: 9.2.3
+version: 9.2.4
 schema: 1
 scm: github.com/pubnub/kotlin
 files:
-  - build/libs/pubnub-kotlin-9.2.3-all.jar
+  - build/libs/pubnub-kotlin-9.2.4-all.jar
 sdks:
   - 
       type: library
@@ -23,8 +23,8 @@ sdks:
             -
               distribution-type: library
               distribution-repository: maven
-              package-name: pubnub-kotlin-9.2.3
-              location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/9.2.3/pubnub-kotlin-9.2.3.jar
+              package-name: pubnub-kotlin-9.2.4
+              location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/9.2.4/pubnub-kotlin-9.2.4.jar
               supported-platforms:
                 supported-operating-systems:
                   Android:
@@ -114,6 +114,11 @@ sdks:
                   license-url: https://www.apache.org/licenses/LICENSE-2.0.txt
                   is-required: Required
 changelog:
+  - date: 2024-08-19
+    version: v9.2.4
+    changes:
+      - type: bug
+        text: "Fixes a crash on Android after `PubNub.destroy` is called and there are requests running."
   - date: 2024-07-29
     version: v9.2.3
     changes:

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v9.2.4
+August 19 2024
+
+#### Fixed
+- Fixes a crash on Android after `PubNub.destroy` is called and there are requests running.
+
 ## v9.2.3
 July 29 2024
 

README.md

@@ -20,13 +20,13 @@ You will need the publish and subscribe keys to authenticate your app. Get your
      <dependency>
         <groupId>com.pubnub</groupId>
         <artifactId>pubnub-kotlin</artifactId>
-        <version>9.2.3</version>
+        <version>9.2.4</version>
      </dependency>
      ```
 
    * for Gradle, add the following dependency in your `gradle.build`:
      ```groovy
-     implementation 'com.pubnub:pubnub-kotlin:9.2.3'
+     implementation 'com.pubnub:pubnub-kotlin:9.2.4'
      ```
 
 2. Configure your keys and create PubNub instance:

gradle.properties

@@ -19,7 +19,7 @@ RELEASE_SIGNING_ENABLED=true
 SONATYPE_HOST=DEFAULT
 SONATYPE_AUTOMATIC_RELEASE=false
 GROUP=com.pubnub
-VERSION_NAME=9.2.3
+VERSION_NAME=9.2.4
 POM_PACKAGING=jar
 
 POM_NAME=PubNub SDK

pubnub-core/pubnub-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

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.")
         }
     }
 

pubnub-core/pubnub-core-impl/src/test/kotlin/com/pubnub/api/legacy/PubNubCoreTest.kt

@@ -66,7 +66,7 @@ class PubNubCoreTest : BaseTest() {
     fun getVersionAndTimeStamp() {
         val version = PubNubCore.SDK_VERSION
         val timeStamp = PubNubCore.timestamp()
-        assertEquals("9.2.3", version)
+        assertEquals("9.2.4", version)
         assertTrue(timeStamp > 0)
     }