From b6d6a7591ba1c0b48ffdef52352709564da8d9be Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Tue, 30 May 2023 19:42:24 +0400 Subject: [PATCH 1/2] fix!: check for two methods parameters orders (#183) BREAKING CHANGE: This requires changes to `MethodFingerprint` --- .../app/revanced/patcher/extensions/Extensions.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt b/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt index f828631..5531b9b 100644 --- a/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt +++ b/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt @@ -220,17 +220,15 @@ private fun replaceOffset( */ internal fun Method.cloneMutable(registerCount: Int = 0) = clone(registerCount).toMutable() -// FIXME: also check the order of parameters as different order equals different method overload internal fun parametersEqual( parameters1: Iterable, parameters2: Iterable ): Boolean { - return parameters1.count() == parameters2.count() && parameters1.all { parameter -> - parameters2.any { - it.startsWith( - parameter - ) - } + if (parameters1.count() != parameters2.count()) return false + val iterator1 = parameters1.iterator() + parameters2.forEach { + if (!it.startsWith(iterator1.next())) return false } + return true } internal val nullOutputStream = object : OutputStream() { From b7eb2d22492ab18b784cfcac43d0c0b09d90f504 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 7 Jun 2023 00:52:08 +0000 Subject: [PATCH 2/2] chore(release): 10.0.0-dev.1 [skip ci] # [10.0.0-dev.1](https://github.com/revanced/revanced-patcher/compare/v9.0.0...v10.0.0-dev.1) (2023-06-07) * fix!: check for two methods parameters orders (#183) ([b6d6a75](https://github.com/revanced/revanced-patcher/commit/b6d6a7591ba1c0b48ffdef52352709564da8d9be)), closes [#183](https://github.com/revanced/revanced-patcher/issues/183) ### BREAKING CHANGES * This requires changes to `MethodFingerprint` --- CHANGELOG.md | 10 ++++++++++ gradle.properties | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c26345e..f84d285 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [10.0.0-dev.1](https://github.com/revanced/revanced-patcher/compare/v9.0.0...v10.0.0-dev.1) (2023-06-07) + + +* fix!: check for two methods parameters orders (#183) ([b6d6a75](https://github.com/revanced/revanced-patcher/commit/b6d6a7591ba1c0b48ffdef52352709564da8d9be)), closes [#183](https://github.com/revanced/revanced-patcher/issues/183) + + +### BREAKING CHANGES + +* This requires changes to `MethodFingerprint` + # [9.0.0](https://github.com/revanced/revanced-patcher/compare/v8.0.0...v9.0.0) (2023-05-23) diff --git a/gradle.properties b/gradle.properties index 15048bb..84239b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style = official -version = 9.0.0 +version = 10.0.0-dev.1