@jacques_gordon/expo-mapbox-navigation 2.1.4 → 2.1.5

package/android/src/main/java/expo/modules/mapboxnavigation/ExpoMapboxNavigationView.kt

@@ -447,43 +447,32 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         voiceInstructionsPlayer = MapboxVoiceInstructionsPlayer(context, voiceLang)
     }
 
-    // ── Voice callbacks (exact pattern from official TurnByTurnExperienceActivity) ──
-    // SpeechError and SpeechValue are swapped vs v2: fold(error, value) in v3
-    // speechCallback: Consumer<Expected<SpeechError, SpeechValue>>
-    // Exact pattern from official TurnByTurnExperienceActivity
-    // NOTE: in v3 fold order is (error, value) — SpeechError is left, SpeechValue is right
+    // ── Voice callbacks — EXACT pattern from official TurnByTurnExperienceActivity ──
+    // MapboxNavigationConsumer is in com.mapbox.navigation.ui.base.util (NOT base.route)
+    // voiceInstructionsPlayerCallback must be defined BEFORE speechCallback (used inside it)
+    private val voiceInstructionsPlayerCallback =
+        com.mapbox.navigation.ui.base.util.MapboxNavigationConsumer<SpeechAnnouncement> { value ->
+            speechApi.clean(value)
+        }
+
     private val speechCallback =
-        com.mapbox.navigation.base.route.MapboxNavigationConsumer<
+        com.mapbox.navigation.ui.base.util.MapboxNavigationConsumer<
             com.mapbox.bindgen.Expected<SpeechError, SpeechValue>
         > { expected ->
             expected.fold(
                 { error ->
-                    // On-device TTS fallback when MP3 is not available
                     if (!isMuted) {
-                        voiceInstructionsPlayer.play(
-                            error.fallback,
-                            voiceInstructionsPlayerCallback
-                        )
+                        voiceInstructionsPlayer.play(error.fallback, voiceInstructionsPlayerCallback)
                     }
                 },
                 { value ->
-                    // Play the synthesized MP3 from Mapbox Voice API
                     if (!isMuted) {
-                        voiceInstructionsPlayer.play(
-                            value.announcement,
-                            voiceInstructionsPlayerCallback
-                        )
+                        voiceInstructionsPlayer.play(value.announcement, voiceInstructionsPlayerCallback)
                     }
                 }
             )
         }
 
-    private val voiceInstructionsPlayerCallback =
-        { announcement: SpeechAnnouncement ->
-            // Cleanup the file after playing
-            speechApi.clean(announcement)
-        }
-
     private val voiceInstructionsObserver = VoiceInstructionsObserver { voiceInstructions ->
         speechApi.generate(voiceInstructions, speechCallback)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Expo module for Mapbox Navigation SDK with 16KB page size support, NDK27, and Mapbox Maps v11.11.0+",
   "main": "build/index.js",
   "types": "build/index.d.ts",