TypeScript
fix(mobile): Android dictation works with regional preferences set (#31030)
Md Ehsanul Haqueb39d0f2fccc7
diff --git a/apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/GoogleVoiceTranscriber.kt b/apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/GoogleVoiceTranscriber.ktindex 6884d720dc6..ce722817dd1 100644--- a/apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/GoogleVoiceTranscriber.kt+++ b/apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/GoogleVoiceTranscriber.kt@@ -22,6 +22,10 @@ internal class VoiceTranscriptionException(cause: Throwable? = null) : Exception(message, cause)+// ML Kit reports every mode UNAVAILABLE for tags with Unicode extensions, which Android adds+// for regional preferences such as the temperature unit (en-US-u-mu-celsius).+internal fun speechLocale(systemLocale: Locale): Locale = systemLocale.stripExtensions()+private val recognitionModes = listOf(SpeechRecognizerOptions.Mode.MODE_ADVANCED,SpeechRecognizerOptions.Mode.MODE_BASICdiff --git a/apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/T3VoiceTranscriptionModule.kt b/apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/T3VoiceTranscriptionModule.ktindex 6884b4d54ed..3218690967f 100644--- a/apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/T3VoiceTranscriptionModule.kt+++ b/apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/T3VoiceTranscriptionModule.kt@@ -37,7 +37,7 @@ class T3VoiceTranscriptionModule : Module() {} else {withContext(Dispatchers.IO) {val context = requireNotNull(appContext.reactContext)- val locale = Resources.getSystem().configuration.locales[0]+ val locale = speechLocale(Resources.getSystem().configuration.locales[0])isGoogleVoiceTranscriptionSupported { MlKitSpeechClient(context, locale, it) }}}@@ -52,7 +52,7 @@ class T3VoiceTranscriptionModule : Module() {)}val context = requireNotNull(appContext.reactContext)- val locale = Resources.getSystem().configuration.locales[0]+ val locale = speechLocale(Resources.getSystem().configuration.locales[0])val mode = prepareGoogleVoiceTranscription { MlKitSpeechClient(context, locale, it) }mapOf("locale" to locale.toLanguageTag(), "mode" to mode)}diff --git a/apps/mobile/modules/t3-voice-transcription/android/src/test/java/expo/modules/t3voicetranscription/GoogleVoiceTranscriberTest.kt b/apps/mobile/modules/t3-voice-transcription/android/src/test/java/expo/modules/t3voicetranscription/GoogleVoiceTranscriberTest.ktindex aaa76dfbf07..445411bbb69 100644--- a/apps/mobile/modules/t3-voice-transcription/android/src/test/java/expo/modules/t3voicetranscription/GoogleVoiceTranscriberTest.kt+++ b/apps/mobile/modules/t3-voice-transcription/android/src/test/java/expo/modules/t3voicetranscription/GoogleVoiceTranscriberTest.kt@@ -4,6 +4,7 @@ import com.google.mlkit.genai.common.FeatureStatusimport com.google.mlkit.genai.common.GenAiExceptionimport com.google.mlkit.genai.speechrecognition.SpeechRecognizerOptionsimport com.google.mlkit.genai.speechrecognition.SpeechRecognizerResponse+import java.util.Localeimport kotlinx.coroutines.CompletableDeferredimport kotlinx.coroutines.cancelAndJoinimport kotlinx.coroutines.flow.flow@@ -14,6 +15,18 @@ import org.junit.Assert.assertTrueimport org.junit.Testclass GoogleVoiceTranscriberTest {+ @Test+ fun dropsRegionalPreferenceExtensionsFromTheSpeechLocale() {+ for ((system, expected) in listOf(+ "en-US-u-mu-celsius" to "en-US",+ "en-GB-u-fw-mon-mu-celsius" to "en-GB",+ "ar-EG-u-nu-latn" to "ar-EG",+ "zh-Hant-TW" to "zh-Hant-TW"+ )) {+ assertEquals(expected, speechLocale(Locale.forLanguageTag(system)).toLanguageTag())+ }+ }+@Testfun preservesUtterancesAndTheirSpacingWithoutDuplicatingHypotheses() = runBlocking {for ((finals, trailing, expected) in listOf(