From 79b9c98a04e5775d1a3755bdc09594b0efd1dff3 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Fri, 16 Dec 2022 08:37:32 +0800 Subject: [PATCH] Modify remove "replace" method's param name statement --- .../YukiHookXposedProcessor.kt | 6 +++--- .../hook/core/YukiMemberHookCreator.kt | 20 +++++++++---------- .../hook/xposed/bridge/YukiHookBridge.kt | 2 +- .../bridge/status/YukiHookModuleStatus.kt | 3 +-- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt b/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt index c827e4d9..2eda698a 100644 --- a/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt +++ b/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt @@ -113,7 +113,7 @@ class YukiHookXposedProcessor : SymbolProcessorProvider { * 移除字符串中的空格与换行符并将双引号替换为单引号 * @return [String] */ - private fun String.removeSpecialChars() = replace("\\s*|\t|\r|\n".toRegex(), replacement = "").replace(oldValue = "\"", newValue = "'") + private fun String.removeSpecialChars() = replace("\\s*|\t|\r|\n".toRegex(), "").replace("\"", "'") override fun process(resolver: Resolver) = emptyList().let { startProcess(resolver); it } @@ -276,8 +276,8 @@ class YukiHookXposedProcessor : SymbolProcessorProvider { gradleKtsFile.exists() -> runCatching { gradleKtsFile.readText() .removeSpecialChars() - .replace(oldValue = "varnamespace", newValue = "") - .replace(oldValue = "valnamespace", newValue = "") + .replace("varnamespace", "") + .replace("valnamespace", "") .split("namespace='")[1] .split("'")[0] }.getOrNull() diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt index 498f3f7a..35395744 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt @@ -632,16 +632,16 @@ class YukiMemberHookCreator @PublishedApi internal constructor( * @return [String] */ fun Class<*>.objectName() = - name.replace(Unit.toString(), newValue = "void") - .replace(oldValue = "java.lang.Void", newValue = "void") - .replace(oldValue = "java.lang.Boolean", newValue = "boolean") - .replace(oldValue = "java.lang.Integer", newValue = "int") - .replace(oldValue = "java.lang.Float", newValue = "float") - .replace(oldValue = "java.lang.Double", newValue = "double") - .replace(oldValue = "java.lang.Long", newValue = "long") - .replace(oldValue = "java.lang.Short", newValue = "short") - .replace(oldValue = "java.lang.Character", newValue = "char") - .replace(oldValue = "java.lang.Byte", newValue = "byte") + name.replace(Unit.toString(), "void") + .replace("java.lang.Void", "void") + .replace("java.lang.Boolean", "boolean") + .replace("java.lang.Integer", "int") + .replace("java.lang.Float", "float") + .replace("java.lang.Double", "double") + .replace("java.lang.Long", "long") + .replace("java.lang.Short", "short") + .replace("java.lang.Character", "char") + .replace("java.lang.Byte", "byte") if (origin == null || target == null) return val originName = origin.objectName() val targetName = target.objectName() diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/YukiHookBridge.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/YukiHookBridge.kt index c5894c50..b17302cf 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/YukiHookBridge.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/YukiHookBridge.kt @@ -129,7 +129,7 @@ object YukiHookBridge { internal val executorName get() = runCatching { classOf().field { name = "TAG" }.ignored().get().string().takeIf { it.isNotBlank() } - ?.replace(oldValue = "Bridge", newValue = "")?.replace(oldValue = "-", newValue = "")?.trim() ?: "unknown" + ?.replace("Bridge", "")?.replace("-", "")?.trim() ?: "unknown" }.getOrNull() ?: "invalid" /** diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/status/YukiHookModuleStatus.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/status/YukiHookModuleStatus.kt index 40097c5b..9369188f 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/status/YukiHookModuleStatus.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/status/YukiHookModuleStatus.kt @@ -73,8 +73,7 @@ internal object YukiHookModuleStatus { * 请使用 [YukiHookAPI.Status.executorName] 获取 * @return [String] 模块未激活会返回 unknown */ - internal val executorName - get() = getXposedBridgeTag().replace(oldValue = "Bridge", newValue = "").replace(oldValue = "-", newValue = "").trim() + internal val executorName get() = getXposedBridgeTag().replace("Bridge", "").replace("-", "").trim() /** * 获取当前 Hook 框架的版本