Skip to content

Commit

Permalink
feat(YouTube): Bump compatibility to 18.37.36 (#3028)
Browse files Browse the repository at this point in the history 
Co-authored-by: LisoUseInAIKyrios <[email protected]>
  • Loading branch information
@oSumAtrIX @LisoUseInAIKyrios
oSumAtrIX and LisoUseInAIKyrios authored Sep 27, 2023
1 parent 04cb04b commit eda28e5
Show file tree
Hide file tree
Showing 56 changed files with 196 additions and 144 deletions.
4 changes: 2 additions & 2 deletions src/main/kotlin/app/revanced/patches/music/misc/microg/MicroGBytecodePatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
)
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
12 changes: 11 additions & 1 deletion .../HideGetPremiumVideoAdvertisementPatch.kt → ...tube/ad/getpremium/HideGetPremiumPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...tlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
),
]
Expand Down
3 changes: 2 additions & 1 deletion ...main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...tlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
60 changes: 28 additions & 32 deletions src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
]
)
],
Expand All @@ -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
"""
)
}
}
26 changes: 6 additions & 20 deletions ...evanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...in/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...in/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...n/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion .../kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...n/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
2 changes: 0 additions & 2 deletions ...revanced/patches/youtube/layout/hide/endscreencards/fingerprints/LayoutIconFingerprint.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...anced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
9 changes: 8 additions & 1 deletion ...main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...lin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
)
]
Expand Down
Loading

1 comment on commit eda28e5

@cyberboh
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oSumAtrIX missing something:

INFO: Decoding app manifest
WARNING: Player flyout menu is incompatible with version 18.37.36. This patch is only compatible with version com.google.android.youtube: 18.16.37, 18.19.35, 18.20.39, 18.23.35, 18.29.38, 18.32.39

Please sign in to comment.