Update voice input settings loading to occur synchronously

Author: abb128

java/src/org/futo/inputmethod/latin/uix/Settings.kt

@@ -194,7 +194,7 @@ class DataStoreHelper {
 }
 
 
-suspend fun <T> Context.getSetting(key: Preferences.Key<T>, default: T): T {
+fun <T> Context.getSetting(key: Preferences.Key<T>, default: T): T {
     /*val valueFlow: Flow<T> =
         this.dataStore.data.map { preferences -> preferences[key] ?: default }.take(1)
 
@@ -263,7 +263,7 @@ data class SettingsKey<T>(
     val default: T
 )
 
-suspend fun <T> Context.getSetting(key: SettingsKey<T>): T {
+ fun <T> Context.getSetting(key: SettingsKey<T>): T {
     return getSetting(key.key, key.default)
 }
 

java/src/org/futo/inputmethod/latin/uix/actions/VoiceInputAction.kt

@@ -101,38 +101,38 @@ private class VoiceInputActionWindow(
     val context = manager.getContext()
 
     private var shouldPlaySounds: Boolean = false
-    private suspend fun loadSettings(): RecognizerViewSettings = coroutineScope {
-        val enableSound = async { context.getSetting(ENABLE_SOUND) }
-        val verboseFeedback = async { context.getSetting(VERBOSE_PROGRESS) }
-        val disallowSymbols = async { context.getSetting(DISALLOW_SYMBOLS) }
-        val useBluetoothAudio = async { context.getSetting(PREFER_BLUETOOTH) }
-        val requestAudioFocus = async { context.getSetting(AUDIO_FOCUS) }
-        val canExpandSpace = async { context.getSetting(CAN_EXPAND_SPACE) }
+    private fun loadSettings(): RecognizerViewSettings {
+        val enableSound = context.getSetting(ENABLE_SOUND)
+        val verboseFeedback = context.getSetting(VERBOSE_PROGRESS)
+        val disallowSymbols = context.getSetting(DISALLOW_SYMBOLS)
+        val useBluetoothAudio = context.getSetting(PREFER_BLUETOOTH)
+        val requestAudioFocus = context.getSetting(AUDIO_FOCUS)
+        val canExpandSpace = context.getSetting(CAN_EXPAND_SPACE)
 
         val primaryModel = model
         val languageSpecificModels = mutableMapOf<Language, ModelLoader>()
         val allowedLanguages = listOf(
             getLanguageFromWhisperString(locale.language)
         ).filterNotNull().toSet()
 
-        shouldPlaySounds = enableSound.await()
+        shouldPlaySounds = enableSound
 
-        return@coroutineScope RecognizerViewSettings(
+        return RecognizerViewSettings(
             shouldShowInlinePartialResult = false,
-            shouldShowVerboseFeedback = verboseFeedback.await(),
+            shouldShowVerboseFeedback = verboseFeedback,
             modelRunConfiguration = MultiModelRunConfiguration(
                 primaryModel = primaryModel,
                 languageSpecificModels = languageSpecificModels
             ),
             decodingConfiguration = DecodingConfiguration(
                 glossary = state.userDictionaryObserver.getWords().map { it.word },
                 languages = allowedLanguages,
-                suppressSymbols = disallowSymbols.await()
+                suppressSymbols = disallowSymbols
             ),
             recordingConfiguration = RecordingSettings(
-                preferBluetoothMic = useBluetoothAudio.await(),
-                requestAudioFocus = requestAudioFocus.await(),
-                canExpandSpace = canExpandSpace.await()
+                preferBluetoothMic = useBluetoothAudio,
+                requestAudioFocus = requestAudioFocus,
+                canExpandSpace = canExpandSpace
             )
         )
     }
@@ -142,9 +142,7 @@ private class VoiceInputActionWindow(
 
     private val initJob = manager.getLifecycleScope().launch {
         yield()
-        val settings = withContext(Dispatchers.IO) {
-            loadSettings()
-        }
+        val settings = loadSettings()
 
         yield()
         val recognizerView = try {