forked from inotia00/revanced-patches
-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(YouTube): Unable to access
Autoplay next video setting inotia00…
- Loading branch information
1 parent
45e692b
commit 189f494
Showing
8 changed files
with
175 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
patches/src/main/kotlin/app/revanced/patches/youtube/utils/fix/cairo/CairoFragmentPatch.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| package app.revanced.patches.youtube.utils.fix.cairo | ||
|
|
||
| import app.revanced.patcher.extensions.InstructionExtensions.addInstruction | ||
| import app.revanced.patcher.extensions.InstructionExtensions.getInstruction | ||
| import app.revanced.patcher.patch.bytecodePatch | ||
| import app.revanced.patcher.patch.resourcePatch | ||
| import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod | ||
| import app.revanced.patches.youtube.utils.playservice.is_19_34_or_greater | ||
| import app.revanced.patches.youtube.utils.playservice.versionCheckPatch | ||
| import app.revanced.patches.youtube.utils.resourceid.settingsFragmentCairo | ||
| import app.revanced.patches.youtube.utils.resourceid.sharedResourceIdPatch | ||
| import app.revanced.util.fingerprint.methodCall | ||
| import app.revanced.util.fingerprint.methodOrThrow | ||
| import app.revanced.util.getReference | ||
| import app.revanced.util.getWalkerMethod | ||
| import app.revanced.util.indexOfFirstInstructionOrThrow | ||
| import app.revanced.util.indexOfFirstLiteralInstructionOrThrow | ||
| import app.revanced.util.insertNode | ||
| import com.android.tools.smali.dexlib2.Opcode | ||
| import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction | ||
| import com.android.tools.smali.dexlib2.iface.reference.MethodReference | ||
| import org.w3c.dom.Element | ||
|
|
||
| private val cairoFragmentResourcePatch = resourcePatch( | ||
| description = "cairoFragmentResourcePatch" | ||
| ) { | ||
| dependsOn(versionCheckPatch) | ||
|
|
||
| execute { | ||
| /** | ||
| * Cairo fragment have been widely rolled out in YouTube 19.34+. | ||
| */ | ||
| if (!is_19_34_or_greater) { | ||
| return@execute | ||
| } | ||
|
|
||
| /** | ||
| * The Preference key for 'Playback' is '@string/playback_key'. | ||
| * Copy the node to add the Preference 'Playback' to the legacy settings fragment. | ||
| */ | ||
| document("res/xml/settings_fragment.xml").use { document -> | ||
| val tags = document.getElementsByTagName("Preference") | ||
| List(tags.length) { tags.item(it) as Element } | ||
| .find { it.getAttribute("android:key") == "@string/auto_play_key" } | ||
| ?.let { node -> | ||
| node.insertNode("Preference", node) { | ||
| for (index in 0 until node.attributes.length) { | ||
| with (node.attributes.item(index)) { | ||
| setAttribute(nodeName, nodeValue) | ||
| } | ||
| } | ||
| setAttribute("android:key", "@string/playback_key") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
| /** | ||
| * What [cairoFragmentPatch] does: | ||
| * 1. Disable Cairo fragment settings. | ||
| * 2. Fix - When spoofing the app version to 19.20 or earlier, the app crashes or the Notifications tab is inaccessible. | ||
| * 3. Fix - Preference 'Playback' is hidden. | ||
| * 4. Some settings that were in Preference 'General' are moved to Preference 'Playback'. | ||
| */ | ||
| val cairoFragmentPatch = bytecodePatch( | ||
| description = "cairoFragmentPatch" | ||
| ) { | ||
| dependsOn( | ||
| cairoFragmentResourcePatch, | ||
| sharedResourceIdPatch, | ||
| versionCheckPatch | ||
| ) | ||
|
|
||
| execute { | ||
| /** | ||
| * Cairo fragment have been widely rolled out in YouTube 19.34+. | ||
| */ | ||
| if (!is_19_34_or_greater) { | ||
| return@execute | ||
| } | ||
|
|
||
| // Instead of disabling all Cairo fragment configs, | ||
| // Just disable 'Load Cairo fragment xml' and 'Set style to Cairo preference'. | ||
| val cairoFragmentConfigMethodCall = cairoFragmentConfigFingerprint | ||
| .methodCall() | ||
|
|
||
| fun MutableMethod.disableCairoFragmentConfig() { | ||
| val insertIndex = indexOfFirstInstructionOrThrow { | ||
| opcode == Opcode.INVOKE_VIRTUAL && | ||
| getReference<MethodReference>()?.toString() == cairoFragmentConfigMethodCall | ||
| } + 2 | ||
| val insertRegister = getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA | ||
|
|
||
| addInstruction(insertIndex, "const/4 v$insertRegister, 0x0") | ||
| } | ||
|
|
||
| settingsFragmentSyntheticFingerprint.methodOrThrow().apply { | ||
| val literalIndex = indexOfFirstLiteralInstructionOrThrow(settingsFragmentCairo) | ||
| val fragmentStyleIndex = indexOfFirstInstructionOrThrow(literalIndex) { | ||
| val reference = getReference<MethodReference>() | ||
| opcode == Opcode.INVOKE_VIRTUAL_RANGE && | ||
| reference?.returnType == "V" && | ||
| reference.parameterTypes.firstOrNull() == "Ljava/lang/String;" | ||
| } | ||
| val fragmentStyleMethod = getWalkerMethod(fragmentStyleIndex) | ||
|
|
||
| arrayOf( | ||
| // Load cairo fragment xml. | ||
| this, | ||
| // Set style to cairo preference. | ||
| fragmentStyleMethod | ||
| ).forEach { method -> | ||
| method.disableCairoFragmentConfig() | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters