From eab33d4bddbb428808c602d319a24896a093a68e Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Sat, 25 Nov 2023 09:36:08 +0900 Subject: [PATCH] build: downgrade dependencies --- .../music/utils/litho/LithoFilterPatch.kt | 19 +++++++---------- .../fingerprints/LithoFilterFingerprint.kt | 2 +- .../youtube/utils/litho/LithoFilterPatch.kt | 21 +++++++------------ .../fingerprints/LithoFilterFingerprint.kt | 2 +- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/music/utils/litho/LithoFilterPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/litho/LithoFilterPatch.kt index 76525df90..905b606bf 100644 --- a/src/main/kotlin/app/revanced/patches/music/utils/litho/LithoFilterPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/utils/litho/LithoFilterPatch.kt @@ -4,6 +4,7 @@ import app.revanced.extensions.exception import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions +import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.music.utils.litho.fingerprints.LithoFilterFingerprint @@ -29,15 +30,15 @@ object LithoFilterPatch : BytecodePatch( LithoFilterFingerprint.result?.let { it.mutableMethod.apply { - removeInstructions(0, 6) + removeInstructions(2, 4) // Remove dummy filter. addFilter = { classDescriptor -> addInstructions( 0, """ - new-instance v0, $classDescriptor - invoke-direct {v0}, $classDescriptor->()V - const/16 v3, ${filterCount++} - aput-object v0, v2, v3 + new-instance v1, $classDescriptor + invoke-direct {v1}, $classDescriptor->()V + const/16 v2, ${filterCount++} + aput-object v1, v0, v2 """ ) } @@ -47,11 +48,5 @@ object LithoFilterPatch : BytecodePatch( } override fun close() = LithoFilterFingerprint.result!! - .mutableMethod.addInstructions( - 0, """ - const/16 v1, $filterCount - new-array v2, v1, [$MUSIC_COMPONENTS_PATH/Filter; - const/4 v1, 0x1 - """ - ) + .mutableMethod.replaceInstruction(0, "const/16 v0, $filterCount") } diff --git a/src/main/kotlin/app/revanced/patches/music/utils/litho/fingerprints/LithoFilterFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/utils/litho/fingerprints/LithoFilterFingerprint.kt index a1ef56019..3bae4b49c 100644 --- a/src/main/kotlin/app/revanced/patches/music/utils/litho/fingerprints/LithoFilterFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/utils/litho/fingerprints/LithoFilterFingerprint.kt @@ -6,7 +6,7 @@ import com.android.tools.smali.dexlib2.AccessFlags object LithoFilterFingerprint : MethodFingerprint( returnType = "V", - accessFlags = AccessFlags.STATIC or AccessFlags.CONSTRUCTOR, + accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.CONSTRUCTOR, customFingerprint = { methodDef, _ -> methodDef.definingClass == "Lapp/revanced/music/patches/components/LithoFilterPatch;" } diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/litho/LithoFilterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/litho/LithoFilterPatch.kt index 0307e7137..5b3e74f9e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/litho/LithoFilterPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/litho/LithoFilterPatch.kt @@ -5,6 +5,7 @@ import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions +import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.shared.patch.litho.ComponentParserPatch @@ -44,15 +45,15 @@ object LithoFilterPatch : BytecodePatch( generalHook("$INTEGRATIONS_CLASS_DESCRIPTOR->filter") LithoFilterFingerprint.result?.mutableMethod?.apply { - removeInstructions(0, 6) + removeInstructions(2, 4) // Remove dummy filter. addFilter = { classDescriptor -> addInstructions( - 0, """ - new-instance v0, $classDescriptor - invoke-direct {v0}, $classDescriptor->()V - const/16 v3, ${filterCount++} - aput-object v0, v2, v3 + 2, """ + new-instance v1, $classDescriptor + invoke-direct {v1}, $classDescriptor->()V + const/16 v2, ${filterCount++} + aput-object v1, v0, v2 """ ) } @@ -61,11 +62,5 @@ object LithoFilterPatch : BytecodePatch( } override fun close() = LithoFilterFingerprint.result!! - .mutableMethod.addInstructions( - 0, """ - const/16 v1, $filterCount - new-array v2, v1, [$COMPONENTS_PATH/Filter; - const/4 v1, 0x1 - """ - ) + .mutableMethod.replaceInstruction(0, "const/16 v0, $filterCount") } diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/litho/fingerprints/LithoFilterFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/litho/fingerprints/LithoFilterFingerprint.kt index 0c3853a5d..d28ba9b83 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/litho/fingerprints/LithoFilterFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/litho/fingerprints/LithoFilterFingerprint.kt @@ -6,7 +6,7 @@ import com.android.tools.smali.dexlib2.AccessFlags object LithoFilterFingerprint : MethodFingerprint( returnType = "V", - accessFlags = AccessFlags.STATIC or AccessFlags.CONSTRUCTOR, + accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.CONSTRUCTOR, customFingerprint = { methodDef, _ -> methodDef.definingClass == "Lapp/revanced/integrations/patches/components/LithoFilterPatch;" }