diff --git a/src/main/kotlin/app/revanced/patches/music/player/oldplayerlayout/OldPlayerLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/music/player/oldplayerlayout/OldPlayerLayoutPatch.kt index 715500403..a42e25dcf 100644 --- a/src/main/kotlin/app/revanced/patches/music/player/oldplayerlayout/OldPlayerLayoutPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/oldplayerlayout/OldPlayerLayoutPatch.kt @@ -5,7 +5,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.music.utils.fingerprints.NewPlayerLayoutFingerprint +import app.revanced.patches.music.player.oldplayerlayout.fingerprints.OldPlayerLayoutFingerprint import app.revanced.patches.music.utils.integrations.Constants.PLAYER import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.SettingsPatch @@ -15,16 +15,24 @@ import app.revanced.util.exception name = "Enable old player layout", description = "Return the player layout to old style.", dependencies = [SettingsPatch::class], - compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")], + compatiblePackages = [ + CompatiblePackage( + "com.google.android.apps.youtube.music", + [ + "6.21.52", + "6.29.58" + ] + ) + ], use = false ) @Suppress("unused") object OldPlayerLayoutPatch : BytecodePatch( - setOf(NewPlayerLayoutFingerprint) + setOf(OldPlayerLayoutFingerprint) ) { override fun execute(context: BytecodeContext) { - NewPlayerLayoutFingerprint.result?.let { + OldPlayerLayoutFingerprint.result?.let { it.mutableMethod.apply { addInstructions( 0, """ @@ -34,7 +42,7 @@ object OldPlayerLayoutPatch : BytecodePatch( """ ) } - } ?: throw NewPlayerLayoutFingerprint.exception + } ?: throw OldPlayerLayoutFingerprint.exception SettingsPatch.addMusicPreference( CategoryType.PLAYER, diff --git a/src/main/kotlin/app/revanced/patches/music/player/oldplayerlayout/fingerprints/OldPlayerLayoutFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/oldplayerlayout/fingerprints/OldPlayerLayoutFingerprint.kt new file mode 100644 index 000000000..62fd614e4 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/music/player/oldplayerlayout/fingerprints/OldPlayerLayoutFingerprint.kt @@ -0,0 +1,12 @@ +package app.revanced.patches.music.player.oldplayerlayout.fingerprints + +import app.revanced.util.fingerprint.LiteralValueFingerprint + +/** + * Deprecated in YouTube Music v6.31.55+ + */ +object OldPlayerLayoutFingerprint : LiteralValueFingerprint( + returnType = "Z", + parameters = emptyList(), + literalSupplier = { 45399578 } +) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/music/utils/fingerprints/NewPlayerLayoutFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/utils/fingerprints/NewPlayerLayoutFingerprint.kt deleted file mode 100644 index 84a965338..000000000 --- a/src/main/kotlin/app/revanced/patches/music/utils/fingerprints/NewPlayerLayoutFingerprint.kt +++ /dev/null @@ -1,9 +0,0 @@ -package app.revanced.patches.music.utils.fingerprints - -import app.revanced.util.fingerprint.LiteralValueFingerprint - -object NewPlayerLayoutFingerprint : LiteralValueFingerprint( - returnType = "Z", - parameters = emptyList(), - literalSupplier = { 45399578 } -) \ No newline at end of file