From 5afb86545fb02b5e64bfea1bf5b30829cca0e854 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:43:11 +0900 Subject: [PATCH] fix: clarify fingerprint name --- .../music/video/videoid/VideoIdPatch.kt | 8 +++---- ...onseModelStoryboardRendererFingerprint.kt} | 2 +- .../parameter/SpoofPlayerParameterPatch.kt | 24 +++++++++---------- ...elGeneralStoryboardRendererFingerprint.kt} | 2 +- ...iveStreamStoryboardRendererFingerprint.kt} | 2 +- ...lStoryboardRecommendedLevelFingerprint.kt} | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) rename src/main/kotlin/app/revanced/patches/music/video/videoid/fingerprints/{PlayerResponseModelImplGeneralFingerprint.kt => PlayerResponseModelStoryboardRendererFingerprint.kt} (85%) rename src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/{PlayerResponseModelImplGeneralFingerprint.kt => PlayerResponseModelGeneralStoryboardRendererFingerprint.kt} (89%) rename src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/{PlayerResponseModelImplLiveStreamFingerprint.kt => PlayerResponseModelLiveStreamStoryboardRendererFingerprint.kt} (89%) rename src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/{PlayerResponseModelImplRecommendedLevelFingerprint.kt => PlayerResponseModelStoryboardRecommendedLevelFingerprint.kt} (89%) diff --git a/src/main/kotlin/app/revanced/patches/music/video/videoid/VideoIdPatch.kt b/src/main/kotlin/app/revanced/patches/music/video/videoid/VideoIdPatch.kt index 7155ab6ca..4c801d1e8 100644 --- a/src/main/kotlin/app/revanced/patches/music/video/videoid/VideoIdPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/video/videoid/VideoIdPatch.kt @@ -7,7 +7,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.smali.ExternalLabel -import app.revanced.patches.music.video.videoid.fingerprints.PlayerResponseModelImplGeneralFingerprint +import app.revanced.patches.music.video.videoid.fingerprints.PlayerResponseModelStoryboardRendererFingerprint import app.revanced.patches.music.video.videoid.fingerprints.VideoIdParentFingerprint import app.revanced.util.exception import com.android.tools.smali.dexlib2.Opcode @@ -19,7 +19,7 @@ import java.io.Closeable object VideoIdPatch : BytecodePatch( setOf( - PlayerResponseModelImplGeneralFingerprint, + PlayerResponseModelStoryboardRendererFingerprint, VideoIdParentFingerprint ) ), Closeable { @@ -55,13 +55,13 @@ object VideoIdPatch : BytecodePatch( } } ?: throw VideoIdParentFingerprint.exception - PlayerResponseModelImplGeneralFingerprint.result + PlayerResponseModelStoryboardRendererFingerprint.result ?.mutableClass?.methods?.find { method -> method.name == backgroundPlaybackMethodName } ?.apply { backgroundPlaybackMethod = this backgroundPlaybackInsertIndex = implementation!!.instructions.size - 1 backgroundPlaybackVideoIdRegister = getInstruction(backgroundPlaybackInsertIndex).registerA - } ?: throw PlayerResponseModelImplGeneralFingerprint.exception + } ?: throw PlayerResponseModelStoryboardRendererFingerprint.exception } override fun close() { diff --git a/src/main/kotlin/app/revanced/patches/music/video/videoid/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/video/videoid/fingerprints/PlayerResponseModelStoryboardRendererFingerprint.kt similarity index 85% rename from src/main/kotlin/app/revanced/patches/music/video/videoid/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/video/videoid/fingerprints/PlayerResponseModelStoryboardRendererFingerprint.kt index 51922ca29..f76ae77a3 100644 --- a/src/main/kotlin/app/revanced/patches/music/video/videoid/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/video/videoid/fingerprints/PlayerResponseModelStoryboardRendererFingerprint.kt @@ -5,7 +5,7 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal object PlayerResponseModelImplGeneralFingerprint : LiteralValueFingerprint( +internal object PlayerResponseModelStoryboardRendererFingerprint : LiteralValueFingerprint( returnType = "Ljava/lang/String;", accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, parameters = emptyList(), diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt index 0673846c2..2f7dd0079 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt @@ -9,9 +9,9 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.util.smali.ExternalLabel -import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelImplGeneralFingerprint -import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelImplLiveStreamFingerprint -import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelImplRecommendedLevelFingerprint +import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelGeneralStoryboardRendererFingerprint +import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelLiveStreamStoryboardRendererFingerprint +import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelStoryboardRecommendedLevelFingerprint import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererDecoderRecommendedLevelFingerprint import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererDecoderSpecFingerprint import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererSpecFingerprint @@ -63,12 +63,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction ) object SpoofPlayerParameterPatch : BytecodePatch( setOf( - PlayerResponseModelImplGeneralFingerprint, - PlayerResponseModelImplLiveStreamFingerprint, - PlayerResponseModelImplRecommendedLevelFingerprint, - StoryboardRendererSpecFingerprint, - StoryboardRendererDecoderSpecFingerprint, + PlayerResponseModelGeneralStoryboardRendererFingerprint, + PlayerResponseModelLiveStreamStoryboardRendererFingerprint, + PlayerResponseModelStoryboardRecommendedLevelFingerprint, StoryboardRendererDecoderRecommendedLevelFingerprint, + StoryboardRendererDecoderSpecFingerprint, + StoryboardRendererSpecFingerprint, StoryboardThumbnailParentFingerprint ) ) { @@ -113,8 +113,8 @@ object SpoofPlayerParameterPatch : BytecodePatch( // Hook storyboard renderer url. arrayOf( - PlayerResponseModelImplGeneralFingerprint, - PlayerResponseModelImplLiveStreamFingerprint + PlayerResponseModelGeneralStoryboardRendererFingerprint, + PlayerResponseModelLiveStreamStoryboardRendererFingerprint ).forEach { fingerprint -> fingerprint.result?.let { it.mutableMethod.apply { @@ -150,7 +150,7 @@ object SpoofPlayerParameterPatch : BytecodePatch( } ?: throw StoryboardRendererDecoderRecommendedLevelFingerprint.exception // Hook the recommended precise seeking thumbnails quality level. - PlayerResponseModelImplRecommendedLevelFingerprint.result?.let { + PlayerResponseModelStoryboardRecommendedLevelFingerprint.result?.let { it.mutableMethod.apply { val moveOriginalRecommendedValueIndex = it.scanResult.patternScanResult!!.endIndex val originalValueRegister = @@ -163,7 +163,7 @@ object SpoofPlayerParameterPatch : BytecodePatch( """ ) } - } ?: throw PlayerResponseModelImplRecommendedLevelFingerprint.exception + } ?: throw PlayerResponseModelStoryboardRecommendedLevelFingerprint.exception StoryboardRendererSpecFingerprint.result?.let { it.mutableMethod.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelGeneralStoryboardRendererFingerprint.kt similarity index 89% rename from src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelGeneralStoryboardRendererFingerprint.kt index 6f93cb64f..accfd3d94 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelGeneralStoryboardRendererFingerprint.kt @@ -6,7 +6,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal object PlayerResponseModelImplGeneralFingerprint : MethodFingerprint( +internal object PlayerResponseModelGeneralStoryboardRendererFingerprint : MethodFingerprint( returnType = "Ljava/lang/String;", accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, parameters = emptyList(), diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplLiveStreamFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelLiveStreamStoryboardRendererFingerprint.kt similarity index 89% rename from src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplLiveStreamFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelLiveStreamStoryboardRendererFingerprint.kt index 23c777f6b..a546c22bc 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplLiveStreamFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelLiveStreamStoryboardRendererFingerprint.kt @@ -6,7 +6,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal object PlayerResponseModelImplLiveStreamFingerprint : MethodFingerprint( +internal object PlayerResponseModelLiveStreamStoryboardRendererFingerprint : MethodFingerprint( returnType = "Ljava/lang/String;", accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, parameters = emptyList(), diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplRecommendedLevelFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelStoryboardRecommendedLevelFingerprint.kt similarity index 89% rename from src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplRecommendedLevelFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelStoryboardRecommendedLevelFingerprint.kt index 38a08458b..fec6b8a1f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelImplRecommendedLevelFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/PlayerResponseModelStoryboardRecommendedLevelFingerprint.kt @@ -6,7 +6,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal object PlayerResponseModelImplRecommendedLevelFingerprint : MethodFingerprint( +internal object PlayerResponseModelStoryboardRecommendedLevelFingerprint : MethodFingerprint( returnType = "I", accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, parameters = emptyList(),