From ef970fd706e1ad488128725b174727e1a00a8b7c Mon Sep 17 00:00:00 2001 From: inotia00 Date: Fri, 27 Jan 2023 00:58:55 +0900 Subject: [PATCH] cleanup --- .../fingerprints/CreateMixPlaylistFingerprint.kt | 6 ------ .../FourthCreateMixPlaylistFingerprint.kt | 6 ------ .../SecondCreateMixPlaylistFingerprint.kt | 6 ------ .../ThirdCreateMixPlaylistFingerprint.kt | 6 ------ .../AccountSwitcherAccessibilityLabelFingerprint.kt | 8 +------- .../patch/CreateButtonRemoverBytecodePatch.kt | 4 ++-- .../shared/fingerprints/EmptyColorFingerprint.kt | 2 +- .../fingerprints/LegacyVideoAdsFingerprint.kt | 5 ++++- .../shared/fingerprints/LithoThemeFingerprint.kt | 5 ++++- .../fingerprints/MainstreamVideoAdsFingerprint.kt | 5 ++++- .../shared/fingerprints/OnDrawFingerprint.kt | 13 ++++++++----- .../SubtitleButtonControllerFingerprint.kt | 7 +++++-- .../shared/fingerprints/TimebarFingerprint.kt | 12 ++++++------ 13 files changed, 35 insertions(+), 50 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/CreateMixPlaylistFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/CreateMixPlaylistFingerprint.kt index 07fcc5ef8..e5b09a7b3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/CreateMixPlaylistFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/CreateMixPlaylistFingerprint.kt @@ -1,16 +1,10 @@ package app.revanced.patches.youtube.layout.general.mixplaylists.bytecode.fingerprints -import app.revanced.patcher.annotation.Name -import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint -import app.revanced.shared.annotation.YouTubeCompatibility import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode -@Name("mix-playlists-first-fingerprint") -@YouTubeCompatibility -@Version("0.0.1") object CreateMixPlaylistFingerprint : MethodFingerprint( returnType = "V", access = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/FourthCreateMixPlaylistFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/FourthCreateMixPlaylistFingerprint.kt index fa70e701d..c408b0a13 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/FourthCreateMixPlaylistFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/FourthCreateMixPlaylistFingerprint.kt @@ -1,16 +1,10 @@ package app.revanced.patches.youtube.layout.general.mixplaylists.bytecode.fingerprints -import app.revanced.patcher.annotation.Name -import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch -import app.revanced.shared.annotation.YouTubeCompatibility import org.jf.dexlib2.Opcode import org.jf.dexlib2.iface.instruction.WideLiteralInstruction -@Name("mix-playlists-fourth-fingerprint") -@YouTubeCompatibility -@Version("0.0.1") object FourthCreateMixPlaylistFingerprint : MethodFingerprint( opcodes = listOf( Opcode.CONST, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/SecondCreateMixPlaylistFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/SecondCreateMixPlaylistFingerprint.kt index d3148ca82..1945be15e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/SecondCreateMixPlaylistFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/SecondCreateMixPlaylistFingerprint.kt @@ -1,16 +1,10 @@ package app.revanced.patches.youtube.layout.general.mixplaylists.bytecode.fingerprints -import app.revanced.patcher.annotation.Name -import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint -import app.revanced.shared.annotation.YouTubeCompatibility import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode -@Name("mix-playlists-second-fingerprint") -@YouTubeCompatibility -@Version("0.0.1") object SecondCreateMixPlaylistFingerprint : MethodFingerprint( returnType = "V", access = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/ThirdCreateMixPlaylistFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/ThirdCreateMixPlaylistFingerprint.kt index 7117f7194..20cd78dc7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/ThirdCreateMixPlaylistFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/bytecode/fingerprints/ThirdCreateMixPlaylistFingerprint.kt @@ -1,16 +1,10 @@ package app.revanced.patches.youtube.layout.general.mixplaylists.bytecode.fingerprints -import app.revanced.patcher.annotation.Name -import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch -import app.revanced.shared.annotation.YouTubeCompatibility import org.jf.dexlib2.Opcode import org.jf.dexlib2.iface.instruction.WideLiteralInstruction -@Name("mix-playlists-third-fingerprint") -@YouTubeCompatibility -@Version("0.0.1") object ThirdCreateMixPlaylistFingerprint : MethodFingerprint( opcodes = listOf( Opcode.INVOKE_STATIC, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/bytecode/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/bytecode/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt index 71be141f7..5c8c77874 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/bytecode/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/bytecode/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt @@ -1,16 +1,10 @@ package app.revanced.patches.youtube.layout.general.personalinformation.bytecode.fingerprints -import app.revanced.patcher.annotation.Name -import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch -import app.revanced.shared.annotation.YouTubeCompatibility -import org.jf.dexlib2.iface.instruction.WideLiteralInstruction import org.jf.dexlib2.Opcode +import org.jf.dexlib2.iface.instruction.WideLiteralInstruction -@Name("account-switcher-accessibility-label-fingerprint") -@YouTubeCompatibility -@Version("0.0.1") object AccountSwitcherAccessibilityLabelFingerprint : MethodFingerprint( opcodes = listOf( Opcode.INVOKE_VIRTUAL, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/bytecode/patch/CreateButtonRemoverBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/bytecode/patch/CreateButtonRemoverBytecodePatch.kt index fdddcf93a..6005eec8c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/bytecode/patch/CreateButtonRemoverBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/bytecode/patch/CreateButtonRemoverBytecodePatch.kt @@ -40,8 +40,8 @@ class CreateButtonRemoverBytecodePatch : BytecodePatch( createRef = (pivotBarInstructions.elementAt(startIndex) as ReferenceInstruction).reference as DexBackedMethodReference } ?: return PivotBarFingerprint.toErrorResult() - PivotBarCreateButtonViewFingerprint.result?.let { - with (it.mutableMethod){ + PivotBarCreateButtonViewFingerprint.result?.let { result -> + with (result.mutableMethod){ val createButtonInstructions = implementation!!.instructions createButtonInstructions.filter { instruction -> val fieldReference = (instruction as? ReferenceInstruction)?.reference as? DexBackedMethodReference diff --git a/src/main/kotlin/app/revanced/shared/fingerprints/EmptyColorFingerprint.kt b/src/main/kotlin/app/revanced/shared/fingerprints/EmptyColorFingerprint.kt index fb74251eb..5e9614a4f 100644 --- a/src/main/kotlin/app/revanced/shared/fingerprints/EmptyColorFingerprint.kt +++ b/src/main/kotlin/app/revanced/shared/fingerprints/EmptyColorFingerprint.kt @@ -6,7 +6,7 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction import org.jf.dexlib2.Opcode object EmptyColorFingerprint : MethodFingerprint( - "V", + returnType = "V", opcodes = listOf(Opcode.DIV_LONG_2ADDR), customFingerprint = { methodDef -> methodDef.implementation?.instructions?.any { instruction -> diff --git a/src/main/kotlin/app/revanced/shared/fingerprints/LegacyVideoAdsFingerprint.kt b/src/main/kotlin/app/revanced/shared/fingerprints/LegacyVideoAdsFingerprint.kt index 9f1991e98..53866ac58 100644 --- a/src/main/kotlin/app/revanced/shared/fingerprints/LegacyVideoAdsFingerprint.kt +++ b/src/main/kotlin/app/revanced/shared/fingerprints/LegacyVideoAdsFingerprint.kt @@ -7,7 +7,10 @@ import org.jf.dexlib2.Opcode import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction object LegacyVideoAdsFingerprint : MethodFingerprint( - "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf( + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf(), + opcodes = listOf( Opcode.CONST_WIDE_16, Opcode.IPUT_WIDE, Opcode.CONST_WIDE_16, diff --git a/src/main/kotlin/app/revanced/shared/fingerprints/LithoThemeFingerprint.kt b/src/main/kotlin/app/revanced/shared/fingerprints/LithoThemeFingerprint.kt index 34c94e153..46ea41d2d 100644 --- a/src/main/kotlin/app/revanced/shared/fingerprints/LithoThemeFingerprint.kt +++ b/src/main/kotlin/app/revanced/shared/fingerprints/LithoThemeFingerprint.kt @@ -6,7 +6,10 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object LithoThemeFingerprint : MethodFingerprint( - "V", AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("L"), listOf( + returnType = "V", + access = AccessFlags.PROTECTED or AccessFlags.FINAL, + parameters = listOf("L"), + opcodes = listOf( Opcode.APUT, Opcode.NEW_INSTANCE, Opcode.INVOKE_DIRECT, diff --git a/src/main/kotlin/app/revanced/shared/fingerprints/MainstreamVideoAdsFingerprint.kt b/src/main/kotlin/app/revanced/shared/fingerprints/MainstreamVideoAdsFingerprint.kt index d822449a2..8fca6e1c9 100644 --- a/src/main/kotlin/app/revanced/shared/fingerprints/MainstreamVideoAdsFingerprint.kt +++ b/src/main/kotlin/app/revanced/shared/fingerprints/MainstreamVideoAdsFingerprint.kt @@ -6,7 +6,10 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object MainstreamVideoAdsFingerprint : MethodFingerprint( - "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L","Z"), listOf( + returnType = "V", + access = AccessFlags.PRIVATE or AccessFlags.FINAL, + parameters = listOf("L","Z"), + opcodes = listOf( Opcode.IGET_OBJECT, Opcode.INVOKE_VIRTUAL, Opcode.MOVE_RESULT_OBJECT, diff --git a/src/main/kotlin/app/revanced/shared/fingerprints/OnDrawFingerprint.kt b/src/main/kotlin/app/revanced/shared/fingerprints/OnDrawFingerprint.kt index bd16a7fa6..a02020a0f 100644 --- a/src/main/kotlin/app/revanced/shared/fingerprints/OnDrawFingerprint.kt +++ b/src/main/kotlin/app/revanced/shared/fingerprints/OnDrawFingerprint.kt @@ -6,9 +6,12 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object OnDrawFingerprint : MethodFingerprint ( - "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), - listOf(Opcode.MOVE_OBJECT_FROM16, Opcode.MOVE_OBJECT_FROM16), - customFingerprint = { methodDef -> - methodDef.name == "onDraw" - } + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L"), + opcodes = listOf( + Opcode.MOVE_OBJECT_FROM16, + Opcode.MOVE_OBJECT_FROM16 + ), + customFingerprint = {it.name == "onDraw"} ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/shared/fingerprints/SubtitleButtonControllerFingerprint.kt b/src/main/kotlin/app/revanced/shared/fingerprints/SubtitleButtonControllerFingerprint.kt index 159f23907..a64554a06 100644 --- a/src/main/kotlin/app/revanced/shared/fingerprints/SubtitleButtonControllerFingerprint.kt +++ b/src/main/kotlin/app/revanced/shared/fingerprints/SubtitleButtonControllerFingerprint.kt @@ -6,7 +6,10 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object SubtitleButtonControllerFingerprint : MethodFingerprint( - "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf( + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L"), + opcodes = listOf( Opcode.IGET_OBJECT, Opcode.IF_NEZ, Opcode.RETURN_VOID, @@ -15,6 +18,6 @@ object SubtitleButtonControllerFingerprint : MethodFingerprint( Opcode.IF_NEZ, Opcode.CONST, Opcode.INVOKE_VIRTUAL, - Opcode.IGET_OBJECT, + Opcode.IGET_OBJECT ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/shared/fingerprints/TimebarFingerprint.kt b/src/main/kotlin/app/revanced/shared/fingerprints/TimebarFingerprint.kt index 989d6dc1a..fc8cd57d3 100644 --- a/src/main/kotlin/app/revanced/shared/fingerprints/TimebarFingerprint.kt +++ b/src/main/kotlin/app/revanced/shared/fingerprints/TimebarFingerprint.kt @@ -5,11 +5,11 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags object TimebarFingerprint : MethodFingerprint( - "V", - AccessFlags.PUBLIC or AccessFlags.FINAL, - listOf("L"), - customFingerprint = { methodDef -> - methodDef.definingClass.endsWith("/TimeBar;") - && methodDef.name.contains("draw") + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L"), + customFingerprint = { + it.definingClass.endsWith("/TimeBar;") + && it.name.contains("draw") } )