From b42e04884bb9a60c3df30b668bfba55b1cf8eaa4 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 5 Nov 2022 22:00:37 +0100 Subject: [PATCH] fix(youtube/video-information): use correct compatibility annotation --- ...ollerCompatibility.kt => VideoInformationCompatibility.kt} | 2 +- .../fingerprints/CreateVideoPlayerSeekbarFingerprint.kt | 3 ++- .../PlayerControllerSetTimeReferenceFingerprint.kt | 4 ++-- .../video/information/fingerprints/PlayerInitFingerprint.kt | 4 ++-- .../misc/video/information/fingerprints/SeekFingerprint.kt | 4 ++-- .../video/information/fingerprints/VideoLengthFingerprint.kt | 4 ++-- .../video/information/fingerprints/VideoTimeFingerprint.kt | 3 ++- .../misc/video/information/patch/VideoInformationPatch.kt | 4 ++-- 8 files changed, 15 insertions(+), 13 deletions(-) rename src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/{PlayerControllerCompatibility.kt => VideoInformationCompatibility.kt} (85%) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/PlayerControllerCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/VideoInformationCompatibility.kt similarity index 85% rename from src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/PlayerControllerCompatibility.kt rename to src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/VideoInformationCompatibility.kt index 13af9391f..7c1ccb813 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/PlayerControllerCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/VideoInformationCompatibility.kt @@ -10,4 +10,4 @@ import app.revanced.patcher.annotation.Package ) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) -internal annotation class PlayerControllerCompatibility +internal annotation class VideoInformationCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt index 81513c502..c5fe86978 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt @@ -5,9 +5,10 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility +import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility @Name("create-video-player-seekbar-fingerprint") -@SponsorBlockCompatibility +@VideoInformationCompatibility @Version("0.0.1") object CreateVideoPlayerSeekbarFingerprint : MethodFingerprint( "V", diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt index 9b97627ce..42b953b7b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt @@ -5,11 +5,11 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility +import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility import org.jf.dexlib2.Opcode @Name("player-controller-set-time-reference-fingerprint") - -@SponsorBlockCompatibility +@VideoInformationCompatibility @Version("0.0.1") object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint( opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT), diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerInitFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerInitFingerprint.kt index 21dada963..2e7f3a09a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerInitFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerInitFingerprint.kt @@ -5,10 +5,10 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility +import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility @Name("player-init-fingerprint") - -@SponsorBlockCompatibility +@VideoInformationCompatibility @Version("0.0.1") object PlayerInitFingerprint : MethodFingerprint( strings = listOf( diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/SeekFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/SeekFingerprint.kt index 88a0e2e8b..2e7851ec3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/SeekFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/SeekFingerprint.kt @@ -5,10 +5,10 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility +import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility @Name("seek-fingerprint") - -@SponsorBlockCompatibility +@VideoInformationCompatibility @Version("0.0.1") object SeekFingerprint : MethodFingerprint( strings = listOf("Attempting to seek during an ad") diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/VideoLengthFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/VideoLengthFingerprint.kt index c3d306f92..1457d8e3f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/VideoLengthFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/VideoLengthFingerprint.kt @@ -5,11 +5,11 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility +import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility import org.jf.dexlib2.Opcode @Name("video-length-fingerprint") - -@SponsorBlockCompatibility +@VideoInformationCompatibility @Version("0.0.1") object VideoLengthFingerprint : MethodFingerprint( opcodes = listOf( diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/VideoTimeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/VideoTimeFingerprint.kt index 3ebb16a52..cfcf2d801 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/VideoTimeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/VideoTimeFingerprint.kt @@ -5,9 +5,10 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility +import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility @Name("video-time-fingerprint") -@SponsorBlockCompatibility +@VideoInformationCompatibility @Version("0.0.1") object VideoTimeFingerprint : MethodFingerprint( strings = listOf("MedialibPlayerTimeInfo{currentPositionMillis=") diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt index dd239db32..4df446b15 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt @@ -18,7 +18,7 @@ import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch -import app.revanced.patches.youtube.misc.video.speed.remember.annotation.RememberPlaybackSpeedCompatibility +import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility import app.revanced.patches.youtube.misc.video.information.fingerprints.* import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.builder.MutableMethodImplementation @@ -29,7 +29,7 @@ import org.jf.dexlib2.util.MethodUtil @Name("video-information") @Description("Hooks YouTube to get information about the current playing video.") -@RememberPlaybackSpeedCompatibility +@VideoInformationCompatibility @Version("0.0.1") @DependsOn([IntegrationsPatch::class]) class VideoInformationPatch : BytecodePatch(