From d2f23a35eba1df7e7151bb589a7266e1cef35ba1 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 27 Aug 2022 12:16:11 +0800 Subject: [PATCH] Modify change YukiHookCallback.Param setArgs to args in YukiBridgeFactory --- .../com/highcapable/yukihookapi/hook/param/HookParam.kt | 2 +- .../hook/xposed/bridge/factory/YukiBridgeFactory.kt | 8 ++++---- .../yukihookapi/hook/xposed/parasitic/AppParasitics.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/HookParam.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/HookParam.kt index 885908d9..71393717 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/HookParam.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/HookParam.kt @@ -352,7 +352,7 @@ class HookParam internal constructor(private val createrInstance: YukiMemberHook if (index < 0) error("HookParam Method args index must be >= 0") if (args.isEmpty()) error("HookParam Method args is empty, mabe not has args") if (index > args.lastIndex) error("HookParam Method args index out of bounds, max is ${args.lastIndex}") - param?.setArgs(index, any) + param?.args(index, any) } /** diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/factory/YukiBridgeFactory.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/factory/YukiBridgeFactory.kt index aec64135..0e78e956 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/factory/YukiBridgeFactory.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/factory/YukiBridgeFactory.kt @@ -184,8 +184,8 @@ internal object YukiHookHelper { this@compat.throwable = value } - override fun setArgs(index: Int, any: Any?) { - this@compat.args[index] = any + override fun args(index: Int, value: Any?) { + this@compat.args[index] = value } override fun invokeOriginalMember(member: Member, vararg args: Any?) = @@ -305,9 +305,9 @@ internal abstract class YukiHookCallback(open val priority: Int) { /** * 设置方法参数 * @param index 数组下标 - * @param any 参数对象实例 + * @param value 参数对象实例 */ - fun setArgs(index: Int, any: Any?) + fun args(index: Int, value: Any?) /** * 执行原始 [Member] diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt index 5fa9cf40..96fab2a2 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt @@ -133,7 +133,7 @@ internal object AppParasitics { if (YukiHookAPI.Configs.isEnableHookSharedPreferences && type == HookEntryType.PACKAGE) YukiHookHelper.hook(ContextImplClass.method { name = "setFilePermissionsFromMode" }, object : YukiMemberHook() { override fun beforeHookedMember(param: Param) { - if ((param.args?.get(0) as? String?)?.endsWith(suffix = "preferences.xml") == true) param.setArgs(index = 1, any = 1) + if ((param.args?.get(0) as? String?)?.endsWith(suffix = "preferences.xml") == true) param.args(index = 1, value = 1) } }) if (YukiHookAPI.Configs.isEnableHookModuleStatus) classOf(loader).apply {