NAVAND-5918 Disconnect CoreVoiceApiClient (#9768)

DSamaryan · github-actions[bot] · commit 92147e58ba36 · 2025-07-25T14:49:31.000Z
* NAVAND-5918 Disconnect CoreVoiceApiClient

* NAVAND-5918 Migrate audio module from ktor to common http engine

* NAVAND-5918 Fix review

* NAVAND-5918 Fix unit test

* NAVAND-5918 Update api file

* NAVAND-5918 Update showcase app proguard file

GitOrigin-RevId: 372f5617a734036f99beeb232bd1bd8cce5e9af9
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -87,7 +87,6 @@ ext {
       toStringVerifier          : '1.4.8',
       kotlinDateTime            : '0.4.1',
       kotlinSerialization       : '1.3.1',
-      ktor                      : '2.3.0',
       coilVersion               : '2.4.0',
       microsoftCognitiveSpeech  : '1.34.0',
       lottie                    : '6.0.0'
@@ -215,15 +214,6 @@ ext {
       kotlinXDateTime           : "org.jetbrains.kotlinx:kotlinx-datetime:${version.kotlinDateTime}",
       kotlinSerialization       : "org.jetbrains.kotlinx:kotlinx-serialization-json:${version.kotlinSerialization}",
 
-      ktorClientCore            : "io.ktor:ktor-client-core:${version.ktor}",
-      ktorClientEncoding        : "io.ktor:ktor-client-encoding:${version.ktor}",
-      ktorClientAndroid         : "io.ktor:ktor-client-android:${version.ktor}",
-      ktorClientAuth            : "io.ktor:ktor-client-auth:${version.ktor}",
-      ktorClientOkHttp          : "io.ktor:ktor-client-okhttp:${version.ktor}",
-      ktorCio                   : "io.ktor:ktor-client-cio:${version.ktor}",
-      ktorClientContentNegotiation: "io.ktor:ktor-client-content-negotiation:${version.ktor}",
-      ktorSerialization         : "io.ktor:ktor-serialization-kotlinx-json:${version.ktor}",
-      ktorWebSockets            : "io.ktor:ktor-client-websockets:${version.ktor}",
       microsoftCognitiveSpeech  : "com.microsoft.cognitiveservices.speech:client-sdk:${version.microsoftCognitiveSpeech}",
       lottie                    : "com.airbnb.android:lottie-compose:${version.lottie}"
   ]
diff --git a/utils/src/main/java/com/mapbox/navigation/utils/internal/UrlUtils.kt b/utils/src/main/java/com/mapbox/navigation/utils/internal/UrlUtils.kt
@@ -7,14 +7,15 @@
  *
  * source: https://github.com/square/okhttp/blob/b4904c65bdf38fd20ca0aacb23b474c50e5c1d06/okhttp/src/jvmMain/kotlin/okhttp3/HttpUrl.kt#L1770
  */
-package com.mapbox.navigation.voice.api
-
+package com.mapbox.navigation.utils.internal
 /* ktlint-disable */
+import androidx.annotation.RestrictTo
 import okio.Buffer
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets.UTF_8
 
-internal object UrlUtils {
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
+object UrlUtils {
 
     private val HEX_DIGITS =
         charArrayOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F')
diff --git a/voice/src/main/java/com/mapbox/navigation/voice/api/MapboxSpeechProvider.kt b/voice/src/main/java/com/mapbox/navigation/voice/api/MapboxSpeechProvider.kt
@@ -19,6 +19,7 @@ import com.mapbox.navigation.ui.base.util.resource.ResourceLoader
 import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadRequest
 import com.mapbox.navigation.ui.utils.internal.resource.load
 import com.mapbox.navigation.utils.internal.ByteBufferBackedInputStream
+import com.mapbox.navigation.utils.internal.UrlUtils
 import com.mapbox.navigation.voice.model.TypeAndAnnouncement
 import com.mapbox.navigation.voice.options.MapboxSpeechApiOptions
 import java.io.InputStream
diff --git a/voice/src/test/java/com/mapbox/navigation/voice/api/MapboxSpeechProviderTest.kt b/voice/src/test/java/com/mapbox/navigation/voice/api/MapboxSpeechProviderTest.kt
@@ -19,6 +19,7 @@ import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadRequest
 import com.mapbox.navigation.utils.internal.InternalJobControlFactory
 import com.mapbox.navigation.utils.internal.JobControl
 import com.mapbox.navigation.utils.internal.ThreadController
+import com.mapbox.navigation.utils.internal.UrlUtils
 import com.mapbox.navigation.voice.options.MapboxSpeechApiOptions
 import com.mapbox.navigation.voice.options.VoiceGender
 import com.mapbox.navigation.voice.testutils.Fixtures
