refactor: re-register intent receiver for IMS

osfans · Jan 30, 2025 · 3d0a48f · 3d0a48f
1 parent 076d1e2
commit 3d0a48f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/app/src/main/java/com/osfans/trime/TrimeApplication.kt b/app/src/main/java/com/osfans/trime/TrimeApplication.kt
@@ -6,6 +6,7 @@ package com.osfans.trime
 
 import android.app.Application
 import android.content.Intent
+import android.content.IntentFilter
 import android.os.Process
 import android.util.Log
 import androidx.core.content.ContextCompat
@@ -35,10 +36,15 @@ class TrimeApplication : Application() {
     private val rimeIntentReceiver = RimeIntentReceiver()
 
     private fun registerBroadcastReceiver() {
+        val intentFilter =
+            IntentFilter().apply {
+                addAction(RimeIntentReceiver.ACTION_DEPLOY)
+                addAction(RimeIntentReceiver.ACTION_SYNC_USER_DATA)
+            }
         ContextCompat.registerReceiver(
             this,
             rimeIntentReceiver,
-            RimeIntentReceiver.intentFilter,
+            intentFilter,
             PERMISSION_TEST_INPUT_METHOD,
             null,
             ContextCompat.RECEIVER_EXPORTED,

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
@@ -10,6 +10,7 @@ import android.app.AlarmManager
 import android.app.Dialog
 import android.app.PendingIntent
 import android.content.Intent
+import android.content.IntentFilter
 import android.content.res.Configuration
 import android.graphics.RectF
 import android.inputmethodservice.InputMethodService
@@ -59,6 +60,7 @@ import com.osfans.trime.ime.composition.CandidatesView
 import com.osfans.trime.ime.keyboard.InitializationUi
 import com.osfans.trime.ime.keyboard.InputFeedbackManager
 import com.osfans.trime.ime.keyboard.KeyboardSwitcher
+import com.osfans.trime.receiver.RimeIntentReceiver
 import com.osfans.trime.util.findSectionFrom
 import com.osfans.trime.util.forceShowSelf
 import com.osfans.trime.util.isNightMode
@@ -90,6 +92,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
     private var inputView: InputView? = null
     private var candidatesView: CandidatesView? = null
     private val inputDeviceManager = InputDeviceManager()
+    private val rimeIntentReceiver = RimeIntentReceiver()
     private var initializationUi: InitializationUi? = null
     private val locales = Array(2) { Locale.getDefault() }
 
@@ -185,6 +188,20 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
         }
     }
 
+    private fun registerReceiver() {
+        val intentFilter =
+            IntentFilter().apply {
+                addAction(RimeIntentReceiver.ACTION_DEPLOY)
+                addAction(RimeIntentReceiver.ACTION_SYNC_USER_DATA)
+            }
+        ContextCompat.registerReceiver(
+            this,
+            rimeIntentReceiver,
+            intentFilter,
+            ContextCompat.RECEIVER_NOT_EXPORTED,
+        )
+    }
+
     override fun onCreate() {
         rime = RimeDaemon.createSession(javaClass.name)
         lifecycleScope.launch {
@@ -232,7 +249,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                         else -> Locale.US
                     }
                 inlineSuggestionHandler = InlineSuggestionHandler(this@TrimeInputMethodService)
-                Timber.d("Trime.onCreate  completed")
+                registerReceiver()
             }
         } catch (e: Exception) {
             Timber.e(e)
@@ -337,6 +354,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
         ThemeManager.removeOnChangedListener(onThemeChangeListener)
         ColorManager.removeOnChangedListener(onColorChangeListener)
         super.onDestroy()
+        unregisterReceiver(rimeIntentReceiver)
         RimeDaemon.destroySession(javaClass.name)
     }
 

diff --git a/app/src/main/java/com/osfans/trime/receiver/RimeIntentReceiver.kt b/app/src/main/java/com/osfans/trime/receiver/RimeIntentReceiver.kt
@@ -8,7 +8,6 @@ package com.osfans.trime.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import com.osfans.trime.BuildConfig
 import com.osfans.trime.daemon.RimeDaemon
 import timber.log.Timber
@@ -34,13 +33,7 @@ class RimeIntentReceiver : BroadcastReceiver() {
     }
 
     companion object {
-        private const val ACTION_DEPLOY = "${BuildConfig.APPLICATION_ID}.action.DEPLOY"
-        private const val ACTION_SYNC_USER_DATA = "${BuildConfig.APPLICATION_ID}.action.SYNC_USER_DATA"
-
-        val intentFilter =
-            IntentFilter().apply {
-                addAction(ACTION_DEPLOY)
-                addAction(ACTION_SYNC_USER_DATA)
-            }
+        const val ACTION_DEPLOY = "${BuildConfig.APPLICATION_ID}.action.DEPLOY"
+        const val ACTION_SYNC_USER_DATA = "${BuildConfig.APPLICATION_ID}.action.SYNC_USER_DATA"
     }
 }