#1064 fix: wait for switch keyboard action to complete before doing next action

Author: sds100

CHANGELOG.md

@@ -42,7 +42,8 @@
 - #1818 the Key Mapper GUI Keyboard is no longer mentioned in the app. It still works but PRO mode
   and the auto switching feature are the preferred way to work around the limitations of the Key
   Mapper keyboard.
-- Allow selecting notification and alarm sound and not just ringtones for Sound action
+- Allow selecting notification and alarm sound and not just ringtones for Sound action.
+- #1064 wait for switch keyboard action to complete before doing next action.
 
 ## [3.2.1](https://github.com/sds100/KeyMapper/releases/tag/v3.2.1)
 

base/src/main/java/io/github/sds100/keymapper/base/actions/PerformActionsUseCase.kt

@@ -36,7 +36,6 @@ import io.github.sds100.keymapper.common.utils.onSuccess
 import io.github.sds100.keymapper.common.utils.otherwise
 import io.github.sds100.keymapper.common.utils.success
 import io.github.sds100.keymapper.common.utils.then
-import io.github.sds100.keymapper.common.utils.valueOrNull
 import io.github.sds100.keymapper.common.utils.withFlag
 import io.github.sds100.keymapper.data.Keys
 import io.github.sds100.keymapper.data.PreferenceDefaults
@@ -77,10 +76,12 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeoutOrNull
 import timber.log.Timber
 
 class PerformActionsUseCaseImpl @AssistedInject constructor(
@@ -310,19 +311,18 @@ class PerformActionsUseCaseImpl @AssistedInject constructor(
             }
 
             is ActionData.SwitchKeyboard -> {
-                result = switchImeInterface
-                    .switchIme(action.imeId)
-                    .onSuccess { imeId ->
-                        val imeInfo = inputMethodAdapter.getInfoById(action.imeId).valueOrNull()
-                            ?: return@onSuccess
-
-                        val message = resourceProvider.getString(
-                            R.string.toast_chose_keyboard,
-                            imeInfo.label,
-                        )
+                switchImeInterface.switchIme(action.imeId)
 
-                        toastAdapter.show(message)
-                    }
+                // See issue #1064. Wait for the input method to finish switching before returning.
+                val chosenIme = withTimeoutOrNull(2000) {
+                    inputMethodAdapter.chosenIme.filterNotNull().first { it.id == action.imeId }
+                }
+
+                if (chosenIme == null) {
+                    result = KMError.SwitchImeFailed
+                } else {
+                    result = Success(Unit)
+                }
             }
 
             is ActionData.Volume.Down -> {