From 16183d8b06f9bf43b6637a1189cb5f45d694af06 Mon Sep 17 00:00:00 2001 From: Fankesyooni Date: Fri, 22 Apr 2022 23:30:48 +0800 Subject: [PATCH] Added duplicate entryClassName checking --- .../yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 3c8a0d9b..ad2c3902 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 @@ -121,6 +121,7 @@ class YukiHookXposedProcessor : SymbolProcessorProvider { if (isInjectOnce) when { it.superTypes.any { type -> type.element.toString() == "IYukiHookXposedInit" } -> { val ecName = entryClassName.ifBlank { "${it.simpleName.asString()}$xposedClassShortName" } + if (entryClassName == it.simpleName.asString()) error(msg = "Duplicate entryClassName \"$entryClassName\"") injectAssets( codePath = (it.location as? FileLocation?)?.filePath ?: "", sourcePath = sourcePath, @@ -146,11 +147,11 @@ class YukiHookXposedProcessor : SymbolProcessorProvider { var entryClassName = "" e.arguments.forEach { pease -> if (pease.name?.asString() == "sourcePath") - sourcePath = pease.value.toString() + sourcePath = pease.value.toString().trim() if (pease.name?.asString() == "modulePackageName") - modulePackageName = pease.value.toString() + modulePackageName = pease.value.toString().trim() if (pease.name?.asString() == "entryClassName") - entryClassName = pease.value.toString() + entryClassName = pease.value.toString().trim() } if ((modulePackageName.startsWith(".") || modulePackageName.endsWith(".") ||