feat(YouTube): Bump compatibility to 18.37.36 (#3028)

Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
ReVanced · Sep 27, 2023 · eda28e5 · eda28e5
1 parent 04cb04b
commit eda28e5
Show file tree

Hide file tree

Showing 56 changed files with 196 additions and 144 deletions.
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/MicroGBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/MicroGBytecodePatch.kt
@@ -12,8 +12,8 @@ import app.revanced.util.microg.MicroGBytecodeHelper
 
 
 @Patch(
- name = "MicroG support",
- description = "Allows YouTube Music ReVanced to run without root and under a different package name.",
+ name = "Vanced MicroG support",
+ description = "Allows YouTube Music to run without root and under a different package name.",
  dependencies = [MicroGResourcePatch::class],
  compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
 )

diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/.../HideGetPremiumVideoAdvertisementPatch.kt → ...tube/ad/getpremium/HideGetPremiumPatch.kt b/.../HideGetPremiumVideoAdvertisementPatch.kt → ...tube/ad/getpremium/HideGetPremiumPatch.kt
@@ -18,7 +18,17 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
  name = "Hide get premium",
  dependencies = [IntegrationsPatch::class, SettingsPatch::class],
  compatiblePackages = [
- CompatiblePackage("com.google.android.youtube", ["18.16.37", "18.19.35", "18.20.39", "18.23.35", "18.29.38", "18.32.39"])
+ CompatiblePackage(
+ "com.google.android.youtube", [
+ "18.16.37",
+ "18.19.35",
+ "18.20.39",
+ "18.23.35",
+ "18.29.38",
+ "18.32.39",
+ "18.37.36"
+ ]
+ )
  ]
 )
 object HideGetPremiumPatch : BytecodePatch(setOf(GetPremiumViewFingerprint)) {

diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
@@ -29,7 +29,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt b/...kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...tlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt b/...tlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  ),
  ]

diff --git a/...main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt b/...main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...tlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt b/...tlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.autocaptions
 
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
@@ -28,7 +29,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ],
@@ -47,38 +49,32 @@ object AutoCaptionsPatch : BytecodePatch(
  )
  )
 
- val startVideoInformerMethod = StartVideoInformerFingerprint.result!!.mutableMethod
+ mapOf(
+ StartVideoInformerFingerprint to 0,
+ SubtitleButtonControllerFingerprint to 1
+ ).forEach { (fingerprint, enabled) ->
+ fingerprint.result?.mutableMethod?.addInstructions(
+ 0,
+ """
+ const/4 v0, 0x$enabled
+ sput-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
+ """
+ ) ?: throw fingerprint.exception
+ }
 
- startVideoInformerMethod.addInstructions(
- 0, """
- const/4 v0, 0x0
- sput-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
- """
- )
-
- val subtitleButtonControllerMethod = SubtitleButtonControllerFingerprint.result!!.mutableMethod
-
- subtitleButtonControllerMethod.addInstructions(
- 0, """
- const/4 v0, 0x1
- sput-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
- """
- )
-
- val subtitleTrackMethod = SubtitleTrackFingerprint.result!!.mutableMethod
-
- subtitleTrackMethod.addInstructionsWithLabels(
- 0, """
- invoke-static {}, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->autoCaptionsEnabled()Z
- move-result v0
- if-eqz v0, :auto_captions_enabled
- sget-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
- if-nez v0, :auto_captions_enabled
- const/4 v0, 0x1
- return v0
- :auto_captions_enabled
- nop
- """
+ SubtitleTrackFingerprint.result?.mutableMethod?.addInstructionsWithLabels(
+ 0,
+ """
+ invoke-static {}, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->autoCaptionsEnabled()Z
+ move-result v0
+ if-eqz v0, :auto_captions_enabled
+ sget-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
+ if-nez v0, :auto_captions_enabled
+ const/4 v0, 0x1
+ return v0
+ :auto_captions_enabled
+ nop
+ """
  )
  }
 }
diff --git a/...evanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt b/...evanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt
@@ -6,25 +6,11 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
 object StartVideoInformerFingerprint : MethodFingerprint(
- "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L", "L", "L"), listOf(
- Opcode.INVOKE_STATIC,
- Opcode.IGET_OBJECT,
- Opcode.IGET_OBJECT,
- Opcode.NEW_INSTANCE,
- Opcode.INVOKE_DIRECT,
+ returnType = "V",
+ accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+ opcodes = listOf(
  Opcode.INVOKE_INTERFACE,
- Opcode.IF_EQZ,
- Opcode.CONST_STRING,
- Opcode.INVOKE_INTERFACE,
- Opcode.IGET_OBJECT,
- Opcode.INVOKE_VIRTUAL,
- Opcode.MOVE_RESULT,
- Opcode.IF_EQZ,
- Opcode.IGET_OBJECT,
- Opcode.INVOKE_VIRTUAL,
- Opcode.MOVE_RESULT,
- Opcode.CONST_4,
- Opcode.IF_EQ,
- Opcode.GOTO,
- )
+ Opcode.RETURN_VOID
+ ),
+ strings = listOf("pc")
 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
@@ -27,7 +27,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...in/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt b/...in/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
@@ -37,7 +37,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...in/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt b/...in/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
@@ -28,7 +28,8 @@ import com.android.tools.smali.dexlib2.Opcode
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...n/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt b/...n/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
@@ -36,7 +36,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/.../kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt b/.../kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
@@ -32,7 +32,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
@@ -26,7 +26,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...n/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt b/...n/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt b/...kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
@@ -30,7 +30,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...revanced/patches/youtube/layout/hide/endscreencards/fingerprints/LayoutIconFingerprint.kt b/...revanced/patches/youtube/layout/hide/endscreencards/fingerprints/LayoutIconFingerprint.kt
@@ -7,8 +7,6 @@ import com.android.tools.smali.dexlib2.Opcode
 object LayoutIconFingerprint : LiteralValueFingerprint(
  returnType = "Landroid/view/View;",
  opcodes = listOf(
- Opcode.CONST_4,
- Opcode.CONST,
  Opcode.INVOKE_VIRTUAL,
  Opcode.MOVE_RESULT_OBJECT,
  Opcode.CHECK_CAST,

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...anced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt b/...anced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
@@ -23,7 +23,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/...main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -27,7 +27,14 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
  LithoFilterPatch::class,
  SettingsPatch::class
  ],
- compatiblePackages = [CompatiblePackage("com.google.android.youtube", ["18.32.39"])]
+ compatiblePackages = [
+ CompatiblePackage(
+ "com.google.android.youtube", [
+ "18.32.39",
+ "18.37.36"
+ ]
+ )
+ ]
 )
 @Suppress("unused")
 object HideLayoutComponentsPatch : BytecodePatch(

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
@@ -35,7 +35,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt b/...kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
@@ -23,7 +23,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/...lin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt b/...lin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt
@@ -23,7 +23,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
@@ -32,7 +32,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
  "18.20.39",
  "18.23.35",
  "18.29.38",
- "18.32.39"
+ "18.32.39",
+ "18.37.36"
  ]
  )
  ]