From 66ed43f5ad267742097ef536dff05dd0d06bd392 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Mon, 9 May 2022 00:57:37 +0800
Subject: [PATCH] Fix Activity destroy non-null unregister bug

---
 .../notify/ui/activity/auto/NotifyIconRuleUpdateActivity.kt   | 4 ++--
 .../java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/activity/auto/NotifyIconRuleUpdateActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/activity/auto/NotifyIconRuleUpdateActivity.kt
index c9055e9..c1e52bf 100644
--- a/app/src/main/java/com/fankes/coloros/notify/ui/activity/auto/NotifyIconRuleUpdateActivity.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/auto/NotifyIconRuleUpdateActivity.kt
@@ -43,13 +43,13 @@ class NotifyIconRuleUpdateActivity : Activity() {
             View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
         window?.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
         window?.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
+        /** 注册 */
+        SystemUITool.register(context = this)
         /** 检测运行状态 */
         if (BaseActivity.isMainThreadRunning) {
             finish()
             return
         }
-        /** 注册 */
-        SystemUITool.register(context = this)
         /** 拉取云端数据 */
         IconRuleManagerTool.sync(appContext) {
             /** 刷新系统界面 */
diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt
index 7056b81..17f7a04 100644
--- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt
@@ -47,7 +47,7 @@ object SystemUITool {
      * 注册广播
      * @param context 实例
      */
-    fun register(context: Context) {
+    fun register(context: Context) = runInSafe {
         /** 注册广播检查模块激活状态 */
         context.registerReceiver(moduleHandlerReceiver, IntentFilter().apply { addAction(Const.ACTION_MODULE_HANDLER_RECEIVER) })
         /** 注册广播通知系统界面改变 */
@@ -58,7 +58,7 @@ object SystemUITool {
      * 取消注册广播
      * @param context 实例
      */
-    fun unregister(context: Context) {
+    fun unregister(context: Context) = runInSafe {
         context.unregisterReceiver(moduleHandlerReceiver)
         context.unregisterReceiver(remindHandlerReceiver)
     }