fixed reroute during destroy

mapbox · Nov 28, 2023 · 5818412 · 5818412
1 parent 711ad4e
commit 5818412
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt
@@ -1289,8 +1289,7 @@ class MapboxNavigation @VisibleForTesting internal constructor(
         runInTelemetryContext { telemetry ->
             telemetry.destroy(this@MapboxNavigation)
         }
-        threadController.cancelAllNonUICoroutines()
-        threadController.cancelAllUICoroutines()
+        threadController.destroy()
         ifNonNull(reachabilityObserverId) {
             ReachabilityService.removeReachabilityObserver(it)
             reachabilityObserverId = null

diff --git a/libnavigation-util/src/main/java/com/mapbox/navigation/utils/internal/ThreadController.kt b/libnavigation-util/src/main/java/com/mapbox/navigation/utils/internal/ThreadController.kt
@@ -103,6 +103,8 @@ class ThreadController {
     }
 
     fun destroy() {
-
+        val reason = CancellationException("thread controller is destroyed")
+        mainRootJob.cancel(reason)
+        ioRootJob.cancel(reason)
     }
 }
diff --git a/...avigation-util/src/test/java/com/mapbox/navigation/utils/internal/ThreadControllerTest.kt b/...avigation-util/src/test/java/com/mapbox/navigation/utils/internal/ThreadControllerTest.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.`is`
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertThat
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
@@ -26,7 +27,7 @@ import kotlin.coroutines.suspendCoroutine
 class ThreadControllerTest {
 
     @get:Rule
-    private val testCoroutineRule = MainCoroutineRule()
+    val testCoroutineRule = MainCoroutineRule()
 
     private val threadController = ThreadController()
 
@@ -143,15 +144,25 @@ class ThreadControllerTest {
     @Test
     fun destroy_thread_controller() {
         val handler = CompletableDeferred<Unit>()
+        var errorMessage: String? = null
         threadController.getIOScopeAndRootJob().scope.launch {
             handler.await()
-            fail("IO scope should be cancelled")
+            errorMessage = "IO scope should be cancelled"
         }
         threadController.getMainScopeAndRootJob().scope.launch {
             handler.await()
-            fail("UI scope should be cancelled")
+            errorMessage = "UI scope should be cancelled"
         }
         threadController.destroy()
         handler.complete(Unit)
+        assertNull(errorMessage)
+
+        threadController.getIOScopeAndRootJob().scope.launch {
+            errorMessage = "IO scope should be cancelled"
+        }
+        threadController.getMainScopeAndRootJob().scope.launch {
+            errorMessage = "UI scope should be cancelled"
+        }
+        assertNull(errorMessage)
     }
 }