From 2ab36dd2f3f76a14a975dca3d7df100344b2b2d8 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Tue, 1 Feb 2022 22:48:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/fankes/miui/notify/hook/HookMain.kt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/fankes/miui/notify/hook/HookMain.kt b/app/src/main/java/com/fankes/miui/notify/hook/HookMain.kt
index 7a1892b..430cead 100644
--- a/app/src/main/java/com/fankes/miui/notify/hook/HookMain.kt
+++ b/app/src/main/java/com/fankes/miui/notify/hook/HookMain.kt
@@ -459,8 +459,7 @@ class HookMain : IXposedHookLoadPackage {
                                         "getSmallIcon",
                                         lpparam.findClass(ExpandedNotificationClass),
                                         Int::class.java
-                                    )
-                                    .apply { isAccessible = true }
+                                    ).apply { isAccessible = true }
                             } catch (_: Throwable) {
                                 /** 旧版方法 */
                                 lpparam.findClass(NotificationUtilClass)
@@ -477,6 +476,7 @@ class HookMain : IXposedHookLoadPackage {
                         }
                         /** 修复下拉通知图标自动设置回 APP 图标的方法 */
                         runWithoutError(error = "AutoSetAppIcon") {
+                            var isNewWay = true
                             try {
                                 /** 新版方法 */
                                 lpparam.findClass(NotificationHeaderViewWrapperInjectorClass)
@@ -487,6 +487,7 @@ class HookMain : IXposedHookLoadPackage {
                                         lpparam.findClass(ExpandedNotificationClass)
                                     ).apply { isAccessible = true }
                             } catch (_: Throwable) {
+                                isNewWay = false
                                 /** 旧版方法 */
                                 lpparam.findClass(NotificationHeaderViewWrapperInjectorClass)
                                     .getDeclaredMethod(
@@ -497,7 +498,7 @@ class HookMain : IXposedHookLoadPackage {
                             }.also {
                                 XposedBridge.hookMethod(it, object : XC_MethodReplacement() {
                                     override fun replaceHookedMethod(param: MethodHookParam): Any? {
-                                        lpparam.hookNotifyIconOnSet(param, isNew = true)
+                                        lpparam.hookNotifyIconOnSet(param, isNew = isNewWay)
                                         return null
                                     }
                                 })