fix: DisableThirdContainer QQ9.0.75+ crash

Closes #1165
cinit · Sep 4, 2024 · f9b683c · f9b683c
1 parent 06460d9
commit f9b683c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/app/src/main/java/me/hd/hook/DisableThirdContainer.kt b/app/src/main/java/me/hd/hook/DisableThirdContainer.kt
@@ -47,12 +47,18 @@ object DisableThirdContainer : CommonSwitchFunctionHook() {
             else
                 "com.tencent.qqnt.chats.core.ui.d.e"
         )
-        val method = thirdContainerClass.declaredMethods.single { method ->
+        hookBeforeIfEnabled(thirdContainerClass.declaredMethods.single { method ->
             val params = method.parameterTypes
             params.size == 1 && params[0] == List::class.java
-        }
-        hookBeforeIfEnabled(method) { param ->
-            param.args[0] = emptyList<Any>()
+        }) { it.args[0] = emptyList<Any>() }
+
+        if (requireMinQQVersion(QQVersion.QQ_9_0_75)) {
+            val newAdManager = Initiator.loadClass("cooperation.vip.ad.TianshuNewAdManager")
+            val conversationThirdView = Initiator.loadClass("com.tencent.mobileqq.activity.home.chats.biz.tianshu.TianShuConversationThirdView")
+            hookBeforeIfEnabled(newAdManager.declaredMethods.single { method ->
+                val params = method.parameterTypes
+                params.size == 1 && params[0] == conversationThirdView
+            }) { it.result = null }
         }
         return true
     }