fix(YouTube Music): Fix compatibility with latest versions

api/revanced-patches.api

@@ -302,6 +302,12 @@ public final class app/revanced/patches/moneymanager/UnlockProPatch : app/revanc
  public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/ad/video/HideMusicVideoAds : app/revanced/patcher/patch/BytecodePatch {
+ public static final field INSTANCE Lapp/revanced/patches/music/ad/video/HideMusicVideoAds;
+ public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+ public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/ad/video/MusicVideoAdsPatch : app/revanced/patcher/patch/BytecodePatch {
  public static final field INSTANCE Lapp/revanced/patches/music/ad/video/MusicVideoAdsPatch;
  public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -314,6 +320,12 @@ public final class app/revanced/patches/music/audio/codecs/CodecsUnlockPatch : a
  public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback : app/revanced/patcher/patch/BytecodePatch {
+ public static final field INSTANCE Lapp/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback;
+ public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+ public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/audio/exclusiveaudio/ExclusiveAudioPatch : app/revanced/patcher/patch/BytecodePatch {
  public static final field INSTANCE Lapp/revanced/patches/music/audio/exclusiveaudio/ExclusiveAudioPatch;
  public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -326,6 +338,12 @@ public final class app/revanced/patches/music/interaction/permanentrepeat/Perman
  public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch : app/revanced/patcher/patch/BytecodePatch {
+ public static final field INSTANCE Lapp/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch;
+ public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+ public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/interaction/permanentshuffle/PermanentShuffleTogglePatch : app/revanced/patcher/patch/BytecodePatch {
  public static final field INSTANCE Lapp/revanced/patches/music/interaction/permanentshuffle/PermanentShuffleTogglePatch;
  public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -338,6 +356,12 @@ public final class app/revanced/patches/music/layout/compactheader/CompactHeader
  public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/layout/compactheader/HideCategoryBar : app/revanced/patcher/patch/BytecodePatch {
+ public static final field INSTANCE Lapp/revanced/patches/music/layout/compactheader/HideCategoryBar;
+ public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+ public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/layout/minimizedplayback/MinimizedPlaybackPatch : app/revanced/patcher/patch/BytecodePatch {
  public static final field INSTANCE Lapp/revanced/patches/music/layout/minimizedplayback/MinimizedPlaybackPatch;
  public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V

src/main/kotlin/app/revanced/patches/music/ad/video/HideMusicVideoAds.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.music.ad.video
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+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.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsParentFingerprint
+import app.revanced.util.exception
+
+@Patch(
+ name = "Hide music video ads",
+ compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
+)
+@Suppress("unused")
+object HideMusicVideoAds : BytecodePatch(
+ setOf(ShowMusicVideoAdsParentFingerprint),
+) {
+ override fun execute(context: BytecodeContext) {
+ ShowMusicVideoAdsParentFingerprint.result?.let {
+ val showMusicVideoAdsMethod = context
+ .toMethodWalker(it.mutableMethod)
+ .nextMethod(it.scanResult.patternScanResult!!.startIndex + 1, true).getMethod() as MutableMethod
+
+ showMusicVideoAdsMethod.addInstruction(0, "const/4 p1, 0x0")
+ } ?: throw ShowMusicVideoAdsParentFingerprint.exception
+ }
+}
+
+@Deprecated("This patch class has been renamed to HideMusicVideoAds.")
+object MusicVideoAdsPatch : BytecodePatch(
+ dependencies = setOf(HideMusicVideoAds::class),
+) {
+ override fun execute(context: BytecodeContext) {
+ }
+}

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsParentFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.music.ad.video.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object ShowMusicVideoAdsParentFingerprint : MethodFingerprint(
+ opcodes = listOf(
+ Opcode.MOVE_RESULT_OBJECT,
+ Opcode.INVOKE_VIRTUAL,
+ Opcode.IGET_OBJECT,
+ ),
+ strings = listOf("maybeRegenerateCpnAndStatsClient called unexpectedly, but no error."),
+)

src/main/kotlin/app/revanced/patches/music/audio/codecs/CodecsUnlockPatch.kt

@@ -10,13 +10,12 @@ import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprin
 import com.android.tools.smali.dexlib2.Opcode
 
 @Patch(
- name = "Codecs unlock",
  description = "Adds more audio codec options. The new audio codecs usually result in better audio quality.",
- compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
+ compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
 )
-@Suppress("unused")
+@Deprecated("This patch is no longer needed as the feature is now enabled by default.")
 object CodecsUnlockPatch : BytecodePatch(
- setOf(CodecsLockFingerprint, AllCodecsReferenceFingerprint)
+ setOf(CodecsLockFingerprint, AllCodecsReferenceFingerprint),
 ) {
  override fun execute(context: BytecodeContext) {
  val codecsLockResult = CodecsLockFingerprint.result!!
@@ -25,13 +24,13 @@ object CodecsUnlockPatch : BytecodePatch(
 
  val scanResultStartIndex = codecsLockResult.scanResult.patternScanResult!!.startIndex
  val instructionIndex = scanResultStartIndex +
-  if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
-  // for 5.16.xx and lower
-  -3
-  } else {
-  // since 5.17.xx
-  -2
-  }
+ if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
+ // for 5.16.xx and lower
+ -3
+ } else {
+ // since 5.17.xx
+ -2
+ }
 
  val allCodecsResult = AllCodecsReferenceFingerprint.result!!
  val allCodecsMethod =
@@ -41,7 +40,7 @@ object CodecsUnlockPatch : BytecodePatch(
 
  implementation.replaceInstruction(
  instructionIndex,
- "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction()
+ "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction(),
  )
  }
 }

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/ExclusiveAudioPatch.kt → src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt

@@ -1,31 +1,36 @@
 package app.revanced.patches.music.audio.exclusiveaudio
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 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.audio.exclusiveaudio.fingerprints.AllowExclusiveAudioPlaybackFingerprint
+import app.revanced.util.exception
 
 @Patch(
- name = "Exclusive audio playback",
+ name = "Enable exclusive audio playback",
  description = "Enables the option to play audio without video.",
- compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
+ compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
 )
 @Suppress("unused")
-object ExclusiveAudioPatch : BytecodePatch(
- setOf(AllowExclusiveAudioPlaybackFingerprint)
+object EnableExclusiveAudioPlayback : BytecodePatch(
+ setOf(AllowExclusiveAudioPlaybackFingerprint),
 ) {
  override fun execute(context: BytecodeContext) {
  AllowExclusiveAudioPlaybackFingerprint.result?.mutableMethod?.apply {
  addInstructions(
  0,
- """
+  """
  const/4 v0, 0x1
  return v0
- """
+ """,
  )
  } ?: throw AllowExclusiveAudioPlaybackFingerprint.exception
  }
-}
+}
+
+@Deprecated("This patch class has been renamed to EnableExclusiveAudioPlayback.")
+object ExclusiveAudioPatch : BytecodePatch(emptySet()) {
+ override fun execute(context: BytecodeContext) = EnableExclusiveAudioPlayback.execute(context)
+}

src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt

@@ -1,25 +1,32 @@
 package app.revanced.patches.music.interaction.permanentshuffle
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 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.interaction.permanentshuffle.fingerprints.DisableShuffleFingerprint
-
+import app.revanced.util.exception
 
 @Patch(
  name = "Permanent shuffle",
  description = "Permanently remember your shuffle preference " +
-  "even if the playlist ends or another track is played.",
+ "even if the playlist ends or another track is played.",
  compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
- use = false
+ use = false,
 )
 @Suppress("unused")
-object PermanentShuffleTogglePatch : BytecodePatch(setOf(DisableShuffleFingerprint)) {
+object PermanentShufflePatch : BytecodePatch(setOf(DisableShuffleFingerprint)) {
  override fun execute(context: BytecodeContext) {
  DisableShuffleFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
  ?: throw DisableShuffleFingerprint.exception
  }
 }
+
+@Deprecated("This patch class has been renamed to PermanentShufflePatch.")
+object PermanentShuffleTogglePatch : BytecodePatch(
+ dependencies = setOf(PermanentShufflePatch::class),
+) {
+ override fun execute(context: BytecodeContext) {
+ }
+}

src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt

@@ -0,0 +1,47 @@
+package app.revanced.patches.music.layout.compactheader
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+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.layout.compactheader.fingerprints.ConstructCategoryBarFingerprint
+import app.revanced.util.exception
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch(
+ name = "Hide category bar",
+ description = "Hides the category bar at the top of the homepage.",
+ compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
+ use = false,
+)
+@Suppress("unused")
+object HideCategoryBar : BytecodePatch(
+ setOf(ConstructCategoryBarFingerprint),
+) {
+ override fun execute(context: BytecodeContext) {
+ ConstructCategoryBarFingerprint.result?.let {
+ it.mutableMethod.apply {
+ val insertIndex = it.scanResult.patternScanResult!!.startIndex
+ val register = getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA
+
+ addInstructions(
+ insertIndex,
+ """
+ const/16 v2, 0x8
+ invoke-virtual {v$register, v2}, Landroid/view/View;->setVisibility(I)V
+ """,
+ )
+ }
+ } ?: throw ConstructCategoryBarFingerprint.exception
+ }
+}
+
+@Deprecated("This patch class has been renamed to HideCategoryBar.")
+object CompactHeaderPatch : BytecodePatch(
+ dependencies = setOf(HideCategoryBar::class),
+) {
+ override fun execute(context: BytecodeContext) {
+ }
+}