From 15b38fc8418b9ce93aa17266f935c451b66e720a Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 23 Oct 2023 00:22:19 +0200 Subject: [PATCH] refactor: Simplify method implementation --- .../patcher/fingerprint/MethodFingerprint.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/app/revanced/patcher/fingerprint/MethodFingerprint.kt b/src/main/kotlin/app/revanced/patcher/fingerprint/MethodFingerprint.kt index e707e6f..785f714 100644 --- a/src/main/kotlin/app/revanced/patcher/fingerprint/MethodFingerprint.kt +++ b/src/main/kotlin/app/revanced/patcher/fingerprint/MethodFingerprint.kt @@ -123,7 +123,7 @@ abstract class MethodFingerprint( */ fun resolve(context: BytecodeContext, forClass: ClassDef): Boolean { for (method in forClass.methods) - if (this.resolve(context, method, forClass)) + if (resolve(context, method, forClass)) return true return false } @@ -397,12 +397,12 @@ abstract class MethodFingerprint( * @param context The [BytecodeContext] to host proxies. * @return True if the resolution was successful, false otherwise. */ - fun Iterable.resolve(context: BytecodeContext, classes: Iterable) { - for (fingerprint in this) // For each fingerprint... - classes@ for (classDef in classes) // ...search through all classes for the MethodFingerprint - if (fingerprint.resolve(context, classDef)) - break@classes // ...if the resolution succeeded, continue with the next MethodFingerprint. - } + fun Iterable.resolve(context: BytecodeContext, classes: Iterable) = + forEach { fingerprint -> + for (classDef in classes) { + if (fingerprint.resolve(context, classDef)) break + } + } private fun MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult.createWarnings( pattern: Iterable, instructions: Iterable