diff --git a/src/main/kotlin/app/revanced/patcher/signature/MethodSignature.kt b/src/main/kotlin/app/revanced/patcher/signature/MethodSignature.kt index 4086853..70f27e0 100644 --- a/src/main/kotlin/app/revanced/patcher/signature/MethodSignature.kt +++ b/src/main/kotlin/app/revanced/patcher/signature/MethodSignature.kt @@ -92,14 +92,14 @@ interface PatternScanMethod { /** * Represents a resolver warning. - * @param expected The opcode the signature expected it to be. - * @param current The current opcode in the pattern. Always different from [expected]. + * @param correctOpcode The opcode the signature expected it to be. + * @param wrongOpcode The opcode the signature currently has. * @param instructionIndex The index of the opcode relative to the instruction list. * @param patternIndex The index of the opcode relative to the pattern list from the signature. */ data class Warning( - val expected: Opcode, - val current: Opcode, + val correctOpcode: Opcode, + val wrongOpcode: Opcode, val instructionIndex: Int, val patternIndex: Int, ) 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 01a07c2..63d5f40 100644 --- a/src/main/kotlin/app/revanced/patcher/signature/resolver/SignatureResolver.kt +++ b/src/main/kotlin/app/revanced/patcher/signature/resolver/SignatureResolver.kt @@ -127,15 +127,15 @@ internal class SignatureResolver( ) = buildList { val pattern = signature.opcodes!! for ((patternIndex, originalIndex) in (scanResult.startIndex until scanResult.endIndex).withIndex()) { - val originalOpcode = instructions.elementAt(originalIndex).opcode + val correctOpcode = instructions.elementAt(originalIndex).opcode val patternOpcode = pattern.elementAt(patternIndex) if ( patternOpcode != null && // unknown opcode - originalOpcode != patternOpcode + correctOpcode != patternOpcode ) { this.add( PatternScanMethod.Fuzzy.Warning( - originalOpcode, patternOpcode, + correctOpcode, patternOpcode, originalIndex, patternIndex, ) )