fix: IntentReceiver was re-registered in TextInputManager

This may leak the receiver registered in TrimeInputMethodService, which leads to a potential crash.
osfans · Apr 13, 2024 · 6084661 · 6084661
1 parent 03701a3
commit 6084661
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt b/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt
@@ -332,7 +332,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
     }
 
     override fun onDestroy() {
-        if (mIntentReceiver != null) mIntentReceiver!!.unregisterReceiver(this)
+        mIntentReceiver?.unregisterReceiver(this)
         mIntentReceiver = null
         InputFeedbackManager.destroy()
         inputView = null

diff --git a/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt b/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt
@@ -16,7 +16,6 @@ import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.data.schema.SchemaManager
 import com.osfans.trime.data.theme.EventManager
 import com.osfans.trime.data.theme.ThemeManager
-import com.osfans.trime.ime.broadcast.IntentReceiver
 import com.osfans.trime.ime.core.Speech
 import com.osfans.trime.ime.core.TrimeInputMethodService
 import com.osfans.trime.ime.enums.Keycode
@@ -59,7 +58,6 @@ class TextInputManager(
     KeyboardView.OnKeyboardActionListener,
     Candidate.EventListener {
     private val prefs get() = AppPrefs.defaultInstance()
-    private var intentReceiver: IntentReceiver? = null
     private var rimeNotificationJob: Job? = null
 
     val locales = Array(2) { Locale.getDefault() }
@@ -101,11 +99,6 @@ class TextInputManager(
      */
     override fun onCreate() {
         super.onCreate()
-
-        intentReceiver =
-            IntentReceiver().also {
-                it.registerReceiver(trime)
-            }
         rimeNotificationJob =
             rime.run { notificationFlow }
                 .onEach(::handleRimeNotification)
@@ -135,9 +128,6 @@ class TextInputManager(
      * Cancels all coroutines and cleans up.
      */
     override fun onDestroy() {
-        intentReceiver?.unregisterReceiver(trime)
-        intentReceiver = null
-
         rimeNotificationJob?.cancel()
         rimeNotificationJob = null
         instance = null