From 03432d214c484ec145310f8effb825b3ec55bd5f Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Thu, 12 Jan 2023 21:50:02 +0800 Subject: [PATCH] Modify remove dataExtra parameter in YukiHookCallback --- .../yukihookapi/hook/core/api/compat/HookCompatHelper.kt | 1 - .../hook/core/api/factory/YukiHookDelegateFactory.kt | 4 ---- .../yukihookapi/hook/core/api/proxy/YukiHookCallback.kt | 7 ------- 3 files changed, 12 deletions(-) diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookCompatHelper.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookCompatHelper.kt index 0b325c28..aa0c9d6b 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookCompatHelper.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookCompatHelper.kt @@ -58,7 +58,6 @@ internal object HookCompatHelper { */ private fun XC_MethodHook.MethodHookParam.compat() = YukiHookCallbackDelegate.createParamCallback( - dataExtra = extra, member = method, instance = thisObject, args = args, diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/factory/YukiHookDelegateFactory.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/factory/YukiHookDelegateFactory.kt index eabe1e1d..9a25844a 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/factory/YukiHookDelegateFactory.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/factory/YukiHookDelegateFactory.kt @@ -27,7 +27,6 @@ */ package com.highcapable.yukihookapi.hook.core.api.factory -import android.os.Bundle import com.highcapable.yukihookapi.hook.core.api.proxy.YukiHookCallback import com.highcapable.yukihookapi.hook.core.api.proxy.YukiMemberHook import com.highcapable.yukihookapi.hook.core.api.proxy.YukiMemberReplacement @@ -56,7 +55,6 @@ internal object YukiHookCallbackDelegate { /** * 创建 [YukiHookCallback.Param] 实例 - * @param dataExtra 当前回调范围内的数据存储实例 * @param member [Member] 实例 * @param instance 当前实例对象 * @param args 方法、构造方法数组 @@ -68,7 +66,6 @@ internal object YukiHookCallbackDelegate { * @return [YukiHookCallback.Param] */ internal fun createParamCallback( - dataExtra: Bundle, member: Member?, instance: Any?, args: Array?, @@ -78,7 +75,6 @@ internal object YukiHookCallbackDelegate { result: Any?, throwable: Throwable? ) = object : YukiHookCallback.Param { - override val dataExtra get() = dataExtra override val member get() = member override val instance get() = instance override val args get() = args diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiHookCallback.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiHookCallback.kt index 2a4a011a..ca757773 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiHookCallback.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiHookCallback.kt @@ -28,7 +28,6 @@ */ package com.highcapable.yukihookapi.hook.core.api.proxy -import android.os.Bundle import com.highcapable.yukihookapi.hook.core.api.priority.YukiHookPriority import java.lang.reflect.Member @@ -43,12 +42,6 @@ internal abstract class YukiHookCallback(internal open val priority: YukiHookPri */ internal interface Param { - /** - * 当前回调范围内的数据存储实例 - * @return [Bundle] - */ - val dataExtra: Bundle - /** * [Member] 实例 * @return [Member] or null