Merge pull request #13 from revanced/patch-update

Update YouTube patches to `17.17.34`
This commit is contained in:
oSumAtrIX 2022-05-07 18:09:26 +02:00 committed by GitHub
commit 045bd44325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 28 additions and 40 deletions

View File

@ -7,7 +7,6 @@ import app.revanced.patches.music.audio.EnableAudioOnlyPatch
import app.revanced.patches.music.layout.RemoveTasteBuilderPatch import app.revanced.patches.music.layout.RemoveTasteBuilderPatch
import app.revanced.patches.music.layout.RemoveUpgradeTabPatch import app.revanced.patches.music.layout.RemoveUpgradeTabPatch
import app.revanced.patches.music.premium.BackgroundPlayPatch import app.revanced.patches.music.premium.BackgroundPlayPatch
import app.revanced.patches.youtube.ad.HomeAdsPatch
import app.revanced.patches.youtube.ad.HomePromoPatch import app.revanced.patches.youtube.ad.HomePromoPatch
import app.revanced.patches.youtube.ad.VideoAdsPatch import app.revanced.patches.youtube.ad.VideoAdsPatch
import app.revanced.patches.youtube.interaction.EnableSeekbarTappingPatch import app.revanced.patches.youtube.interaction.EnableSeekbarTappingPatch
@ -27,7 +26,7 @@ object Index {
val patches: List<() -> Patch<Data>> = listOf( val patches: List<() -> Patch<Data>> = listOf(
::IntegrationsPatch, ::IntegrationsPatch,
::FixLocaleConfigErrorPatch, ::FixLocaleConfigErrorPatch,
::HomeAdsPatch, //::HomeAdsPatch,
::VideoAdsPatch, ::VideoAdsPatch,
::HomePromoPatch, ::HomePromoPatch,
::MinimizedPlaybackPatch, ::MinimizedPlaybackPatch,

View File

@ -22,7 +22,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction11x
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.03.38", "17.14.35") listOf("17.03.38", "17.14.35", "17.17.34")
) )
) )
@ -43,8 +43,8 @@ class HomePromoPatch : BytecodePatch(
MethodSignatureMetadata( MethodSignatureMetadata(
"promoted-discovery-app-parent-method", "promoted-discovery-app-parent-method",
MethodMetadata( MethodMetadata(
"Ljjl;", "Ljre;",
"lG", "lP",
), ),
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
@ -94,8 +94,8 @@ class HomePromoPatch : BytecodePatch(
MethodSignatureMetadata( MethodSignatureMetadata(
"promoted-discovery-action-parent-method", "promoted-discovery-action-parent-method",
MethodMetadata( MethodMetadata(
"Ljjc;", "Ljqv;",
"lG", "lP",
), ),
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
@ -150,7 +150,7 @@ class HomePromoPatch : BytecodePatch(
val requiredMethod = result.findParentMethod( val requiredMethod = result.findParentMethod(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"promoted-discovery-action-parent-method", "promoted-discovery-action-method",
methodMetadata, methodMetadata,
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,

View File

@ -20,7 +20,7 @@ import org.jf.dexlib2.Opcode
private val packageMetadata = listOf( private val packageMetadata = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.14.35") listOf("17.14.35", "17.17.34")
) )
) )
@ -39,7 +39,7 @@ class VideoAdsPatch : BytecodePatch(
MethodSignatureMetadata( MethodSignatureMetadata(
"show-video-ads-constructor", "show-video-ads-constructor",
MethodMetadata( MethodMetadata(
"zai", "Laadb",
"<init>", "<init>",
), ),
PatternScanMethod.Fuzzy(2),// FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2),// FIXME: Test this threshold and find the best value.

View File

@ -24,7 +24,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.14.35") listOf("17.17.34")
) )
) )
@ -40,7 +40,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"enable-seekbar-tapping-parent-signature", "enable-seekbar-tapping-parent-signature",
MethodMetadata("Lesa;", "<init>"), // unknown MethodMetadata("Lzhj;", "J"), // unknown
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature for a parent method, which is needed to find the actual method required to be patched.", "Signature for a parent method, which is needed to find the actual method required to be patched.",
@ -85,7 +85,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"enable-seekbar-tapping-signature", "enable-seekbar-tapping-signature",
MethodMetadata("Lesa;", "onTouchEvent"), // unknown MethodMetadata("Lfao;", "onTouchEvent"), // unknown
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature for the method required to be patched.", "Signature for the method required to be patched.",
@ -97,7 +97,6 @@ class EnableSeekbarTappingPatch : BytecodePatch(
listOf( listOf(
Opcode.INVOKE_VIRTUAL, Opcode.INVOKE_VIRTUAL,
Opcode.MOVE_RESULT_WIDE, Opcode.MOVE_RESULT_WIDE,
Opcode.INT_TO_FLOAT,
Opcode.IGET, Opcode.IGET,
Opcode.IGET_OBJECT, Opcode.IGET_OBJECT,
Opcode.IGET, Opcode.IGET,
@ -115,15 +114,6 @@ class EnableSeekbarTappingPatch : BytecodePatch(
Opcode.NEW_INSTANCE, Opcode.NEW_INSTANCE,
Opcode.INVOKE_DIRECT, Opcode.INVOKE_DIRECT,
Opcode.IPUT_OBJECT, Opcode.IPUT_OBJECT,
Opcode.NEW_INSTANCE,
Opcode.INVOKE_VIRTUAL,
Opcode.MOVE_RESULT,
Opcode.FLOAT_TO_INT,
Opcode.INVOKE_VIRTUAL,
Opcode.MOVE_RESULT,
Opcode.FLOAT_TO_INT,
Opcode.INVOKE_DIRECT,
Opcode.IPUT_OBJECT,
Opcode.INVOKE_VIRTUAL Opcode.INVOKE_VIRTUAL
) )
) )

View File

@ -20,7 +20,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.14.35") listOf("17.14.35", "17.17.34")
) )
) )
@ -36,7 +36,7 @@ class CreateButtonRemoverPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"create-button-method", "create-button-method",
MethodMetadata(null, null), // unknown MethodMetadata("Lkne", "z"), // unknown
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature for the method required to be patched.", "Signature for the method required to be patched.",

View File

@ -18,7 +18,7 @@ import org.jf.dexlib2.Opcode
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.14.35") listOf("17.17.34")
) )
) )
@ -34,7 +34,7 @@ class HideReelsPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"hide-reels-signature", "hide-reels-signature",
MethodMetadata(null, null), // unknown MethodMetadata("Ljvy", "<init>"), // unknown
PatternScanMethod.Fuzzy(3), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(3), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature for the method required to be patched.", "Signature for the method required to be patched.",
@ -59,7 +59,6 @@ class HideReelsPatch : BytecodePatch(
"[B", "[B",
"[B", "[B",
"[B", "[B",
"[B",
"[B" "[B"
), ),
listOf( listOf(

View File

@ -19,7 +19,7 @@ import org.jf.dexlib2.Opcode
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.14.35") listOf("17.14.35", "17.17.34")
) )
) )
@ -35,7 +35,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"minimized-playback-manager", "minimized-playback-manager",
MethodMetadata(null, null), // unknown MethodMetadata("Lype", "j"), // unknown
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature for the method required to be patched.", "Signature for the method required to be patched.",

View File

@ -21,7 +21,7 @@ import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.14.35") listOf("17.17.34")
) )
) )
@ -37,7 +37,7 @@ class OldQualityLayoutPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"old-quality-parent-method-signature", "old-quality-parent-method-signature",
MethodMetadata(null, null), // unknown MethodMetadata("Libh", "<init>"), // unknown
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature to find a parent method required by the Old Quality Layout patch.", "Signature to find a parent method required by the Old Quality Layout patch.",
@ -45,7 +45,7 @@ class OldQualityLayoutPatch : BytecodePatch(
), ),
"V", "V",
AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
listOf("L", "L", "L", "L", "L", "L", "L", "[B"), listOf("L", "L", "L", "L", "L", "L", "L"),
listOf( listOf(
Opcode.INVOKE_DIRECT, Opcode.INVOKE_DIRECT,
Opcode.IPUT_OBJECT, Opcode.IPUT_OBJECT,
@ -82,7 +82,7 @@ class OldQualityLayoutPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"old-quality-method-signature", "old-quality-method-signature",
MethodMetadata(null, null), // unknown MethodMetadata("Libh", null), // unknown
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature to find the method required by the Old Quality Layout patch", "Signature to find the method required by the Old Quality Layout patch",

View File

@ -19,7 +19,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction11x
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.14.35") listOf("17.14.35", "17.17.34")
) )
) )
@ -35,7 +35,7 @@ class ShortsButtonRemoverPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"pivotbar-buttons-method-tabenum", "pivotbar-buttons-method-tabenum",
MethodMetadata(null, null), // unknown MethodMetadata("Lkne", "z"), // unknown
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature for the pivotbar method that creates all button views.", "Signature for the pivotbar method that creates all button views.",
@ -69,7 +69,7 @@ class ShortsButtonRemoverPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"pivotbar-buttons-method-view", "pivotbar-buttons-method-view",
MethodMetadata(null, null), // unknown MethodMetadata("Lkne", "z"), // unknown
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Signature for the pivotbar method that creates all button views.", "Signature for the pivotbar method that creates all button views.",

View File

@ -11,7 +11,7 @@ import org.w3c.dom.Element
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.14.35") listOf("17.14.35", "17.17.34")
) )
) )
class FixLocaleConfigErrorPatch : ResourcePatch( class FixLocaleConfigErrorPatch : ResourcePatch(

View File

@ -22,7 +22,7 @@ import org.jf.dexlib2.immutable.ImmutableMethodImplementation
private val compatiblePackages = listOf( private val compatiblePackages = listOf(
PackageMetadata( PackageMetadata(
"com.google.android.youtube", "com.google.android.youtube",
listOf("17.03.38", "17.14.35") listOf("17.03.38", "17.14.35", "17.17.34")
) )
) )
@ -38,7 +38,7 @@ class IntegrationsPatch : BytecodePatch(
MethodSignature( MethodSignature(
MethodSignatureMetadata( MethodSignatureMetadata(
"integrations-patch", "integrations-patch",
MethodMetadata(null, null), // unknown MethodMetadata("Lacnx", "onCreate"),
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value. PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
compatiblePackages, compatiblePackages,
"Inject the integrations into the application with the method of this signature", "Inject the integrations into the application with the method of this signature",