Delay launch of eventHandlerJob in InputView

rocka · rocka · commit 0a53ba4fd9d5 · 2023-10-04T20:13:33.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/InputView.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/InputView.kt
@@ -16,6 +16,7 @@ import androidx.annotation.RequiresApi
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.*
 import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.fcitx.fcitx5.android.R
 import org.fcitx.fcitx5.android.core.CapabilityFlags
@@ -83,11 +84,7 @@ class InputView(
         setOnClickListener(placeholderOnClickListener)
     }
 
-    private val eventHandlerJob = service.lifecycleScope.launch {
-        fcitx.runImmediately { eventFlow }.collect {
-            handleFcitxEvent(it)
-        }
-    }
+    private val eventHandlerJob: Job
 
     private val scope = DynamicScope()
     private val themedContext = context.withTheme(R.style.Theme_InputViewTheme)
@@ -183,6 +180,12 @@ class InputView(
         // MUST call before any operation
         setupScope()
 
+        eventHandlerJob = service.lifecycleScope.launch {
+            fcitx.runImmediately { eventFlow }.collect {
+                handleFcitxEvent(it)
+            }
+        }
+
         // restore punctuation mapping in case of InputView recreation
         fcitx.launchOnReady {
             punctuation.updatePunctuationMapping(it.statusAreaActionsCached)
