From 1b2fbbca26f0435479c3d5e1312cb186259ece2b Mon Sep 17 00:00:00 2001 From: Lucaskyy Date: Wed, 13 Apr 2022 21:04:26 +0200 Subject: [PATCH] refactor: rename method to resolverMethod --- .../kotlin/app/revanced/patcher/signature/MethodSignature.kt | 5 ++--- .../revanced/patcher/signature/resolver/SignatureResolver.kt | 4 ++-- src/test/kotlin/app/revanced/patcher/PatcherTest.kt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/app/revanced/patcher/signature/MethodSignature.kt b/src/main/kotlin/app/revanced/patcher/signature/MethodSignature.kt index f52aae1..1becbaa 100644 --- a/src/main/kotlin/app/revanced/patcher/signature/MethodSignature.kt +++ b/src/main/kotlin/app/revanced/patcher/signature/MethodSignature.kt @@ -11,7 +11,6 @@ import org.jf.dexlib2.Opcode * @param methodParameters The parameters of the method. * @param opcodes A list of opcodes of the method. */ -@Suppress("ArrayInDataClass") data class MethodSignature( val name: String, val metadata: SignatureMetadata, @@ -46,10 +45,10 @@ data class MethodMetadata( /** * Metadata for the Patcher, this contains things like how the Patcher should interpret this signature. - * @param method The method the resolver should use to resolve the signature. + * @param resolverMethod The method the resolver should use to resolve the signature. */ data class PatcherMetadata( - val method: ResolverMethod + val resolverMethod: ResolverMethod ) /** diff --git a/src/main/kotlin/app/revanced/patcher/signature/resolver/SignatureResolver.kt b/src/main/kotlin/app/revanced/patcher/signature/resolver/SignatureResolver.kt index 308d7d5..e30c3fd 100644 --- a/src/main/kotlin/app/revanced/patcher/signature/resolver/SignatureResolver.kt +++ b/src/main/kotlin/app/revanced/patcher/signature/resolver/SignatureResolver.kt @@ -89,8 +89,8 @@ internal class SignatureResolver( val pattern = signature.opcodes!! val size = pattern.count() var threshold = 0 - if (signature.metadata.patcher.method is ResolverMethod.Fuzzy) { - threshold = signature.metadata.patcher.method.threshold + if (signature.metadata.patcher.resolverMethod is ResolverMethod.Fuzzy) { + threshold = signature.metadata.patcher.resolverMethod.threshold } for (instructionIndex in 0 until count) { diff --git a/src/test/kotlin/app/revanced/patcher/PatcherTest.kt b/src/test/kotlin/app/revanced/patcher/PatcherTest.kt index d8eeda9..2729860 100644 --- a/src/test/kotlin/app/revanced/patcher/PatcherTest.kt +++ b/src/test/kotlin/app/revanced/patcher/PatcherTest.kt @@ -39,7 +39,7 @@ internal class PatcherTest { comment = "Main method of TestClass. Version 1.0.0" ), patcher = PatcherMetadata( - method = ResolverMethod.Fuzzy(2) + resolverMethod = ResolverMethod.Fuzzy(2) ) ), "V",