优化代码

Author: Chenhe

app/src/main/java/cc/chenhe/qqnotifyevo/BootCompletedReceiver.kt

@@ -4,6 +4,8 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import cc.chenhe.qqnotifyevo.service.NotificationMonitorService
+import cc.chenhe.qqnotifyevo.utils.MODE_LEGACY
+import cc.chenhe.qqnotifyevo.utils.getMode
 
 /**
  * 系统启动完成广播接收器
@@ -12,8 +14,10 @@ import cc.chenhe.qqnotifyevo.service.NotificationMonitorService
 class BootCompletedReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
-            val start = Intent(context, NotificationMonitorService::class.java)
-            context.startService(start)
+            if (getMode(context) == MODE_LEGACY) {
+                val start = Intent(context, NotificationMonitorService::class.java)
+                context.startService(start)
+            }
         }
     }
 }

app/src/main/java/cc/chenhe/qqnotifyevo/core/InnerNotificationProcessor.kt

@@ -51,8 +51,9 @@ class InnerNotificationProcessor(
             else -> null
         }
         Timber.tag(TAG).v("Clear all evolutionary notifications.")
-        (context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).run {
+        (context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).apply {
             ids?.forEach { id -> cancel(id) }
+            ids?.clear()
         }
     }
 
@@ -79,7 +80,7 @@ class InnerNotificationProcessor(
                                              conversation: Conversation, sbn: StatusBarNotification,
                                              original: Notification): Notification {
         val history = getHistoryMessage(tag)
-        var notification: Notification = createConversationNotification(context, tag, channel, conversation, original)
+        var notification: Notification? = null
         for (c in history) {
             if (c.name != conversation.name || c.isGroup && channel != NotifyChannel.GROUP ||
                     !c.isGroup && channel == NotifyChannel.GROUP) {
@@ -93,7 +94,7 @@ class InnerNotificationProcessor(
             sendNotification(context, tag, c.name.hashCode(), notification)
             commander.cancelNotification(sbn.key)
         }
-        return notification
+        return notification ?: Notification() // 此处返回值没有实际意义
     }
 
     private fun addNotifyId(@NotificationProcessor.Companion.SourceTag tag: Int, ids: Int) {

app/src/main/java/cc/chenhe/qqnotifyevo/service/NevoDecorator.kt

@@ -1,5 +1,6 @@
 package cc.chenhe.qqnotifyevo.service
 
+import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -19,7 +20,7 @@ import timber.log.Timber
 class NevoDecorator : NevoDecoratorService(), LifecycleOwner {
 
     companion object {
-        var instance: NevoDecorator? = null
+        private var instance: NevoDecorator? = null
 
         fun isRunning(): Boolean {
             return try {
@@ -51,6 +52,7 @@ class NevoDecorator : NevoDecoratorService(), LifecycleOwner {
 
     override fun getLifecycle(): Lifecycle = lifecycleRegistry
 
+    @SuppressLint("WrongThread") // wrong report
     override fun onCreate() {
         super.onCreate()
         instance = this

app/src/main/java/cc/chenhe/qqnotifyevo/service/NotificationMonitorService.kt

@@ -22,7 +22,7 @@ class NotificationMonitorService : NotificationListenerService(), InnerNotificat
     companion object {
         private const val TAG = "NotifyMonitor"
 
-        var instance: NotificationMonitorService? = null
+        private var instance: NotificationMonitorService? = null
 
         fun isRunning(): Boolean {
             return try {