Remove InputWindowManager#ensureThread

rocka · rocka · commit 7827e0d69dbb · 2024-01-23T00:56:56.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/wm/InputWindowManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/wm/InputWindowManager.kt
@@ -15,7 +15,6 @@ import org.fcitx.fcitx5.android.input.broadcast.InputBroadcastReceiver
 import org.fcitx.fcitx5.android.input.broadcast.InputBroadcaster
 import org.fcitx.fcitx5.android.input.dependency.UniqueViewComponent
 import org.fcitx.fcitx5.android.input.dependency.context
-import org.fcitx.fcitx5.android.utils.isUiThread
 import org.mechdancer.dependency.DynamicScope
 import org.mechdancer.dependency.manager.must
 import org.mechdancer.dependency.minusAssign
@@ -67,7 +66,6 @@ class InputWindowManager : UniqueViewComponent<InputWindowManager, FrameLayout>(
         window: R,
         createView: Boolean = false
     ) where R : W, R : E {
-        ensureThread()
         if (window.key in essentialWindows) {
             if (essentialWindows[window.key]!!.first === window)
                 Timber.d("Skip adding essential window $window")
@@ -90,7 +88,6 @@ class InputWindowManager : UniqueViewComponent<InputWindowManager, FrameLayout>(
      * Moreover, [attachWindow] can also add the essential window with key.
      */
     fun attachWindow(windowKey: EssentialWindow.Key) {
-        ensureThread()
         essentialWindows[windowKey]?.let { (window, _) ->
             attachWindow(window)
         } ?: throw IllegalStateException("$windowKey is not a known essential window key")
@@ -116,7 +113,6 @@ class InputWindowManager : UniqueViewComponent<InputWindowManager, FrameLayout>(
      * [attachWindow] includes the operation done by [addEssentialWindow].
      */
     fun attachWindow(window: InputWindow) {
-        ensureThread()
         if (window === currentWindow)
             Timber.d("Skip attaching $window")
         val newView = if (window is EssentialWindow) {
@@ -168,10 +164,5 @@ class InputWindowManager : UniqueViewComponent<InputWindowManager, FrameLayout>(
         this.scope = scope
     }
 
-    private fun ensureThread() {
-        if (!isUiThread())
-            throw IllegalThreadStateException("Window manager must be operated in main thread!")
-    }
-
     fun isAttached(window: InputWindow) = currentWindow === window
 }
