mirror of
https://github.com/ReVanced/revanced-patches.git
synced 2026-01-25 11:41:04 +00:00
Compare commits
12 Commits
v2.191.0-d
...
v2.191.0-d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7383bdf67 | ||
|
|
01e36428a0 | ||
|
|
187c1eb14a | ||
|
|
acadac3049 | ||
|
|
bf5c197eb8 | ||
|
|
73e8b3f81b | ||
|
|
1c2f499b1c | ||
|
|
32599ab13d | ||
|
|
19519d1d06 | ||
|
|
2ff70e8b8f | ||
|
|
1e21b0b572 | ||
|
|
18180745bc |
2
.github/workflows/pull_request.yml
vendored
2
.github/workflows/pull_request.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Open pull request
|
- name: Open pull request
|
||||||
uses: repo-sync/pull-request@v2
|
uses: repo-sync/pull-request@v2
|
||||||
with:
|
with:
|
||||||
|
|||||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
# Make sure the release step uses its own credentials:
|
# Make sure the release step uses its own credentials:
|
||||||
# https://github.com/cycjimmy/semantic-release-action#private-packages
|
# https://github.com/cycjimmy/semantic-release-action#private-packages
|
||||||
|
|||||||
35
CHANGELOG.md
35
CHANGELOG.md
@@ -1,3 +1,38 @@
|
|||||||
|
# [2.191.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.18...v2.191.0-dev.19) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **YouTube:** Add `Bypass URL redirects` patch ([125cac5](https://github.com/ReVanced/revanced-patches/commit/125cac5928c9b71d35253f1fd7651f4a30e15529))
|
||||||
|
|
||||||
|
# [2.191.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.17...v2.191.0-dev.18) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **YouTube - Premium heading:** Allow using default heading ([#3029](https://github.com/ReVanced/revanced-patches/issues/3029)) ([d5ab35a](https://github.com/ReVanced/revanced-patches/commit/d5ab35a444523baa0586fcb9513d6ae4f2518946))
|
||||||
|
|
||||||
|
# [2.191.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.16...v2.191.0-dev.17) (2023-09-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **YouTube:** Bump compatibility to `18.37.36` ([#3028](https://github.com/ReVanced/revanced-patches/issues/3028)) ([eda28e5](https://github.com/ReVanced/revanced-patches/commit/eda28e507e7fb5171eeb15a5a0532929ee611211))
|
||||||
|
|
||||||
|
# [2.191.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.15...v2.191.0-dev.16) (2023-09-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **YouTube - Hide info cards:** Fix info cards not hiding for some users ([#3039](https://github.com/ReVanced/revanced-patches/issues/3039)) ([cb38637](https://github.com/ReVanced/revanced-patches/commit/cb38637e6be968d54561a1e0466b9259dbf0b4ee))
|
||||||
|
|
||||||
|
# [2.191.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.14...v2.191.0-dev.15) (2023-09-26)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **YouTube - Client spoof:** adjust settings text ([#3035](https://github.com/ReVanced/revanced-patches/issues/3035)) ([59a2e96](https://github.com/ReVanced/revanced-patches/commit/59a2e9617fc4f898e87cefeb3d2c6996b925fa90))
|
||||||
|
|
||||||
# [2.191.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.13...v2.191.0-dev.14) (2023-09-26)
|
# [2.191.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.13...v2.191.0-dev.14) (2023-09-26)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
org.gradle.parallel = true
|
org.gradle.parallel = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
kotlin.code.style = official
|
kotlin.code.style = official
|
||||||
version = 2.191.0-dev.14
|
version = 2.191.0-dev.19
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -12,8 +12,8 @@ import app.revanced.util.microg.MicroGBytecodeHelper
|
|||||||
|
|
||||||
|
|
||||||
@Patch(
|
@Patch(
|
||||||
name = "MicroG support",
|
name = "Vanced MicroG support",
|
||||||
description = "Allows YouTube Music ReVanced to run without root and under a different package name.",
|
description = "Allows YouTube Music to run without root and under a different package name.",
|
||||||
dependencies = [MicroGResourcePatch::class],
|
dependencies = [MicroGResourcePatch::class],
|
||||||
compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
|
compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -18,7 +18,17 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
|
|||||||
name = "Hide get premium",
|
name = "Hide get premium",
|
||||||
dependencies = [IntegrationsPatch::class, SettingsPatch::class],
|
dependencies = [IntegrationsPatch::class, SettingsPatch::class],
|
||||||
compatiblePackages = [
|
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)) {
|
object HideGetPremiumPatch : BytecodePatch(setOf(GetPremiumViewFingerprint)) {
|
||||||
@@ -29,7 +29,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.revanced.patches.youtube.layout.autocaptions
|
package app.revanced.patches.youtube.layout.autocaptions
|
||||||
|
|
||||||
|
import app.revanced.extensions.exception
|
||||||
import app.revanced.patcher.data.BytecodeContext
|
import app.revanced.patcher.data.BytecodeContext
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
|
||||||
@@ -28,7 +29,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"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(
|
SubtitleTrackFingerprint.result?.mutableMethod?.addInstructionsWithLabels(
|
||||||
0, """
|
0,
|
||||||
const/4 v0, 0x0
|
"""
|
||||||
sput-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
|
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
|
||||||
val subtitleButtonControllerMethod = SubtitleButtonControllerFingerprint.result!!.mutableMethod
|
if-nez v0, :auto_captions_enabled
|
||||||
|
const/4 v0, 0x1
|
||||||
subtitleButtonControllerMethod.addInstructions(
|
return v0
|
||||||
0, """
|
:auto_captions_enabled
|
||||||
const/4 v0, 0x1
|
nop
|
||||||
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
|
|
||||||
"""
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,25 +6,11 @@ import com.android.tools.smali.dexlib2.AccessFlags
|
|||||||
import com.android.tools.smali.dexlib2.Opcode
|
import com.android.tools.smali.dexlib2.Opcode
|
||||||
|
|
||||||
object StartVideoInformerFingerprint : MethodFingerprint(
|
object StartVideoInformerFingerprint : MethodFingerprint(
|
||||||
"V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L", "L", "L"), listOf(
|
returnType = "V",
|
||||||
Opcode.INVOKE_STATIC,
|
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
||||||
Opcode.IGET_OBJECT,
|
opcodes = listOf(
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.NEW_INSTANCE,
|
|
||||||
Opcode.INVOKE_DIRECT,
|
|
||||||
Opcode.INVOKE_INTERFACE,
|
Opcode.INVOKE_INTERFACE,
|
||||||
Opcode.IF_EQZ,
|
Opcode.RETURN_VOID
|
||||||
Opcode.CONST_STRING,
|
),
|
||||||
Opcode.INVOKE_INTERFACE,
|
strings = listOf("pc")
|
||||||
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,
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
@@ -5,39 +5,57 @@ import app.revanced.patcher.patch.PatchException
|
|||||||
import app.revanced.patcher.patch.ResourcePatch
|
import app.revanced.patcher.patch.ResourcePatch
|
||||||
import app.revanced.patcher.patch.annotation.CompatiblePackage
|
import app.revanced.patcher.patch.annotation.CompatiblePackage
|
||||||
import app.revanced.patcher.patch.annotation.Patch
|
import app.revanced.patcher.patch.annotation.Patch
|
||||||
import java.nio.file.Files
|
import app.revanced.patcher.patch.options.types.BooleanPatchOption.Companion.booleanPatchOption
|
||||||
import java.nio.file.StandardCopyOption
|
import kotlin.io.path.copyTo
|
||||||
import kotlin.io.path.exists
|
|
||||||
|
|
||||||
@Patch(
|
@Patch(
|
||||||
name = "Premium heading",
|
name = "Premium heading",
|
||||||
description = "Shows premium branding on the home screen.",
|
description = "Show or hide the premium heading.",
|
||||||
compatiblePackages = [
|
compatiblePackages = [
|
||||||
CompatiblePackage("com.google.android.youtube")
|
CompatiblePackage("com.google.android.youtube")
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
object PremiumHeadingPatch : ResourcePatch() {
|
object PremiumHeadingPatch : ResourcePatch() {
|
||||||
|
private const val DEFAULT_HEADING_RES = "yt_wordmark_header"
|
||||||
|
private const val PREMIUM_HEADING_RES = "yt_premium_wordmark_header"
|
||||||
|
|
||||||
|
private val usePremiumHeading by booleanPatchOption(
|
||||||
|
key = "usePremiumHeading",
|
||||||
|
default = true,
|
||||||
|
title = "Use premium heading",
|
||||||
|
description = "Whether to use the premium heading.",
|
||||||
|
required = true,
|
||||||
|
)
|
||||||
|
|
||||||
override fun execute(context: ResourceContext) {
|
override fun execute(context: ResourceContext) {
|
||||||
val resDirectory = context["res"]
|
val resDirectory = context["res"]
|
||||||
if (!resDirectory.isDirectory) throw PatchException("The res folder can not be found.")
|
|
||||||
|
|
||||||
val (original, replacement) = "yt_premium_wordmark_header" to "yt_wordmark_header"
|
val (original, replacement) = if (usePremiumHeading!!)
|
||||||
val modes = arrayOf("light", "dark")
|
DEFAULT_HEADING_RES to PREMIUM_HEADING_RES
|
||||||
|
else
|
||||||
|
PREMIUM_HEADING_RES to DEFAULT_HEADING_RES
|
||||||
|
|
||||||
arrayOf("xxxhdpi", "xxhdpi", "xhdpi", "hdpi", "mdpi").forEach { size ->
|
val variants = arrayOf("light", "dark")
|
||||||
val headingDirectory = resDirectory.resolve("drawable-$size")
|
|
||||||
modes.forEach { mode ->
|
|
||||||
val fromPath = headingDirectory.resolve("${original}_$mode.png").toPath()
|
|
||||||
val toPath = headingDirectory.resolve("${replacement}_$mode.png").toPath()
|
|
||||||
|
|
||||||
if (!fromPath.exists())
|
arrayOf(
|
||||||
throw PatchException("The file $fromPath does not exist in the resources. Therefore, this patch can not succeed.")
|
"xxxhdpi",
|
||||||
Files.copy(
|
"xxhdpi",
|
||||||
fromPath,
|
"xhdpi",
|
||||||
toPath,
|
"hdpi",
|
||||||
StandardCopyOption.REPLACE_EXISTING
|
"mdpi"
|
||||||
)
|
).mapNotNull { dpi ->
|
||||||
|
resDirectory.resolve("drawable-$dpi").takeIf { it.exists() }?.toPath()
|
||||||
|
}.also {
|
||||||
|
if (it.isEmpty())
|
||||||
|
throw PatchException("The drawable folder can not be found. Therefore, the patch can not be applied.")
|
||||||
|
}.forEach { path ->
|
||||||
|
|
||||||
|
variants.forEach { mode ->
|
||||||
|
val fromPath = path.resolve("${original}_$mode.png")
|
||||||
|
val toPath = path.resolve("${replacement}_$mode.png")
|
||||||
|
|
||||||
|
fromPath.copyTo(toPath, true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -37,7 +37,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -28,7 +28,8 @@ import com.android.tools.smali.dexlib2.Opcode
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -36,7 +36,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -32,7 +32,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ import com.android.tools.smali.dexlib2.Opcode
|
|||||||
object LayoutIconFingerprint : LiteralValueFingerprint(
|
object LayoutIconFingerprint : LiteralValueFingerprint(
|
||||||
returnType = "Landroid/view/View;",
|
returnType = "Landroid/view/View;",
|
||||||
opcodes = listOf(
|
opcodes = listOf(
|
||||||
Opcode.CONST_4,
|
|
||||||
Opcode.CONST,
|
|
||||||
Opcode.INVOKE_VIRTUAL,
|
Opcode.INVOKE_VIRTUAL,
|
||||||
Opcode.MOVE_RESULT_OBJECT,
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
Opcode.CHECK_CAST,
|
Opcode.CHECK_CAST,
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -27,7 +27,14 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
|
|||||||
LithoFilterPatch::class,
|
LithoFilterPatch::class,
|
||||||
SettingsPatch::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")
|
@Suppress("unused")
|
||||||
object HideLayoutComponentsPatch : BytecodePatch(
|
object HideLayoutComponentsPatch : BytecodePatch(
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.Infocards
|
|||||||
import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsIncognitoParentFingerprint
|
import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsIncognitoParentFingerprint
|
||||||
import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsMethodCallFingerprint
|
import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsMethodCallFingerprint
|
||||||
import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
|
import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
|
||||||
|
import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
|
||||||
import com.android.tools.smali.dexlib2.Opcode
|
import com.android.tools.smali.dexlib2.Opcode
|
||||||
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
|
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
|
||||||
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
|
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
|
||||||
@@ -22,6 +23,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
|
|||||||
description = "Hides info cards in videos.",
|
description = "Hides info cards in videos.",
|
||||||
dependencies = [
|
dependencies = [
|
||||||
IntegrationsPatch::class,
|
IntegrationsPatch::class,
|
||||||
|
LithoFilterPatch::class,
|
||||||
HideInfocardsResourcePatch::class
|
HideInfocardsResourcePatch::class
|
||||||
],
|
],
|
||||||
compatiblePackages = [
|
compatiblePackages = [
|
||||||
@@ -33,7 +35,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
@@ -45,6 +48,9 @@ object HideInfoCardsPatch : BytecodePatch(
|
|||||||
InfocardsMethodCallFingerprint,
|
InfocardsMethodCallFingerprint,
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
|
private const val FILTER_CLASS_DESCRIPTOR =
|
||||||
|
"Lapp/revanced/integrations/patches/components/HideInfoCardsFilterPatch;"
|
||||||
|
|
||||||
override fun execute(context: BytecodeContext) {
|
override fun execute(context: BytecodeContext) {
|
||||||
InfocardsIncognitoFingerprint.also {
|
InfocardsIncognitoFingerprint.also {
|
||||||
it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef)
|
it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef)
|
||||||
@@ -79,5 +85,8 @@ object HideInfoCardsPatch : BytecodePatch(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Info cards can also appear as litho components.
|
||||||
|
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -32,7 +32,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -36,7 +36,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
@@ -54,8 +55,6 @@ object HideShortsComponentsPatch : BytecodePatch(
|
|||||||
private const val FILTER_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/components/ShortsFilter;"
|
private const val FILTER_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/components/ShortsFilter;"
|
||||||
|
|
||||||
override fun execute(context: BytecodeContext) {
|
override fun execute(context: BytecodeContext) {
|
||||||
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
|
|
||||||
|
|
||||||
// region Hide the Shorts shelf.
|
// region Hide the Shorts shelf.
|
||||||
|
|
||||||
ReelConstructorFingerprint.result?.let {
|
ReelConstructorFingerprint.result?.let {
|
||||||
@@ -74,13 +73,20 @@ object HideShortsComponentsPatch : BytecodePatch(
|
|||||||
|
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
// region Hide the Shorts buttons.
|
// region Hide the Shorts buttons in older versions of YouTube.
|
||||||
|
|
||||||
// Some Shorts buttons are views, hide them by setting their visibility to GONE.
|
// Some Shorts buttons are views, hide them by setting their visibility to GONE.
|
||||||
CreateShortsButtonsFingerprint.result?.let {
|
CreateShortsButtonsFingerprint.result?.let {
|
||||||
ShortsButtons.values().forEach { button -> button.injectHideCall(it.mutableMethod) }
|
ShortsButtons.entries.forEach { button -> button.injectHideCall(it.mutableMethod) }
|
||||||
} ?: throw CreateShortsButtonsFingerprint.exception
|
} ?: throw CreateShortsButtonsFingerprint.exception
|
||||||
|
|
||||||
|
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
// region Hide the Shorts buttons in newer versions of YouTube.
|
||||||
|
|
||||||
|
LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
|
||||||
|
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
// region Hide the navigation bar.
|
// region Hide the navigation bar.
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -28,7 +28,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ import org.w3c.dom.Element
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
|
|||||||
PlayerTypeHookPatch::class,
|
PlayerTypeHookPatch::class,
|
||||||
],
|
],
|
||||||
compatiblePackages = [
|
compatiblePackages = [
|
||||||
CompatiblePackage("com.google.android.youtube", ["18.32.39"])
|
CompatiblePackage("com.google.android.youtube", ["18.37.36"])
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
@@ -91,49 +91,40 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
|
|||||||
throw TextComponentAtomicReferenceFingerprint.exception
|
throw TextComponentAtomicReferenceFingerprint.exception
|
||||||
}?.let { textComponentContextFingerprintResult ->
|
}?.let { textComponentContextFingerprintResult ->
|
||||||
val conversionContextIndex = textComponentContextFingerprintResult
|
val conversionContextIndex = textComponentContextFingerprintResult
|
||||||
.scanResult.patternScanResult!!.startIndex
|
.scanResult.patternScanResult!!.endIndex
|
||||||
val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!!
|
val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!!
|
||||||
.scanResult.patternScanResult!!.startIndex
|
.scanResult.patternScanResult!!.startIndex
|
||||||
|
|
||||||
val insertIndex = atomicReferenceStartIndex + 6
|
val insertIndex = atomicReferenceStartIndex + 9
|
||||||
|
|
||||||
textComponentContextFingerprintResult.mutableMethod.apply {
|
textComponentContextFingerprintResult.mutableMethod.apply {
|
||||||
// Get the conversion context obfuscated field name, and the registers for the AtomicReference and CharSequence
|
// Get the conversion context obfuscated field name
|
||||||
val conversionContextFieldReference =
|
val conversionContextFieldReference =
|
||||||
getInstruction<ReferenceInstruction>(conversionContextIndex).reference
|
getInstruction<ReferenceInstruction>(conversionContextIndex).reference
|
||||||
|
|
||||||
// Reuse the free register to make room for the atomic reference register.
|
// Free register to hold the conversion context
|
||||||
val freeRegister =
|
val freeRegister =
|
||||||
getInstruction<TwoRegisterInstruction>(atomicReferenceStartIndex).registerB
|
getInstruction<TwoRegisterInstruction>(atomicReferenceStartIndex).registerB
|
||||||
|
|
||||||
val atomicReferenceRegister =
|
val atomicReferenceRegister =
|
||||||
getInstruction<FiveRegisterInstruction>(atomicReferenceStartIndex + 1).registerC
|
getInstruction<FiveRegisterInstruction>(atomicReferenceStartIndex + 6).registerC
|
||||||
|
|
||||||
val moveCharSequenceInstruction = getInstruction<TwoRegisterInstruction>(insertIndex - 1)
|
// Instruction that is replaced, and also has the CharacterSequence register.
|
||||||
|
val moveCharSequenceInstruction = getInstruction<TwoRegisterInstruction>(insertIndex)
|
||||||
val charSequenceSourceRegister = moveCharSequenceInstruction.registerB
|
val charSequenceSourceRegister = moveCharSequenceInstruction.registerB
|
||||||
val charSequenceTargetRegister = moveCharSequenceInstruction.registerA
|
val charSequenceTargetRegister = moveCharSequenceInstruction.registerA
|
||||||
|
|
||||||
// In order to preserve the atomic reference register, because it is overwritten,
|
|
||||||
// use another free register to store it.
|
|
||||||
replaceInstruction(
|
|
||||||
atomicReferenceStartIndex + 2,
|
|
||||||
"move-result-object v$freeRegister"
|
|
||||||
)
|
|
||||||
replaceInstruction(
|
|
||||||
atomicReferenceStartIndex + 3,
|
|
||||||
"move-object v$charSequenceSourceRegister, v$freeRegister"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Move the current instance to the free register, and get the conversion context from it.
|
// Move the current instance to the free register, and get the conversion context from it.
|
||||||
replaceInstruction(insertIndex - 1, "move-object/from16 v$freeRegister, p0")
|
// Must replace the instruction to preserve the control flow label.
|
||||||
|
replaceInstruction(insertIndex, "move-object/from16 v$freeRegister, p0")
|
||||||
addInstructions(
|
addInstructions(
|
||||||
insertIndex,
|
insertIndex + 1,
|
||||||
"""
|
"""
|
||||||
# Move context to free register
|
# Move context to free register
|
||||||
iget-object v$freeRegister, v$freeRegister, $conversionContextFieldReference
|
iget-object v$freeRegister, v$freeRegister, $conversionContextFieldReference
|
||||||
invoke-static {v$freeRegister, v$atomicReferenceRegister, v$charSequenceSourceRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
|
invoke-static {v$freeRegister, v$atomicReferenceRegister, v$charSequenceSourceRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
|
||||||
move-result-object v$freeRegister
|
move-result-object v$freeRegister
|
||||||
# Replace the original char sequence with the modified one.
|
# Replace the original instruction
|
||||||
move-object v${charSequenceTargetRegister}, v${freeRegister}
|
move-object v${charSequenceTargetRegister}, v${freeRegister}
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
@@ -152,7 +143,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
|
|||||||
val isDisLikesBooleanReference = getInstruction<ReferenceInstruction>(patternResult.endIndex).reference
|
val isDisLikesBooleanReference = getInstruction<ReferenceInstruction>(patternResult.endIndex).reference
|
||||||
|
|
||||||
val textViewFieldReference = // Like/Dislike button TextView field
|
val textViewFieldReference = // Like/Dislike button TextView field
|
||||||
getInstruction<ReferenceInstruction>(patternResult.endIndex - 2).reference
|
getInstruction<ReferenceInstruction>(patternResult.endIndex - 1).reference
|
||||||
|
|
||||||
// Check if the hooked TextView object is that of the dislike button.
|
// Check if the hooked TextView object is that of the dislike button.
|
||||||
// If RYD is disabled, or the TextView object is not that of the dislike button, the execution flow is not interrupted.
|
// If RYD is disabled, or the TextView object is not that of the dislike button, the execution flow is not interrupted.
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
|
package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
|
||||||
|
|
||||||
|
import app.revanced.patcher.extensions.or
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||||
import com.android.tools.smali.dexlib2.AccessFlags
|
import com.android.tools.smali.dexlib2.AccessFlags
|
||||||
import com.android.tools.smali.dexlib2.Opcode
|
import com.android.tools.smali.dexlib2.Opcode
|
||||||
|
|
||||||
object ShortsTextViewFingerprint : MethodFingerprint(
|
object ShortsTextViewFingerprint : MethodFingerprint(
|
||||||
// 18.29.38 method is public final visibility, but in 18.23.35 and older it's protected final.
|
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
||||||
// If 18.23.35 is dropped then accessFlags should be specified here.
|
|
||||||
returnType = "V",
|
returnType = "V",
|
||||||
parameters = listOf("L", "L"),
|
parameters = listOf("L", "L"),
|
||||||
opcodes = listOf(
|
opcodes = listOf(
|
||||||
@@ -27,7 +27,6 @@ object ShortsTextViewFingerprint : MethodFingerprint(
|
|||||||
Opcode.IF_EQ,
|
Opcode.IF_EQ,
|
||||||
Opcode.RETURN_VOID,
|
Opcode.RETURN_VOID,
|
||||||
Opcode.IGET_OBJECT, // TextView field
|
Opcode.IGET_OBJECT, // TextView field
|
||||||
Opcode.CHECK_CAST,
|
|
||||||
Opcode.IGET_BOOLEAN, // boolean field
|
Opcode.IGET_BOOLEAN, // boolean field
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -13,13 +13,17 @@ object TextComponentAtomicReferenceFingerprint : MethodFingerprint(
|
|||||||
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
||||||
parameters = listOf("L"),
|
parameters = listOf("L"),
|
||||||
opcodes = listOf(
|
opcodes = listOf(
|
||||||
Opcode.MOVE_OBJECT, // Register A and B is context, use B as context, reuse A as free register
|
Opcode.MOVE_OBJECT, // Register B is free register
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
Opcode.INVOKE_VIRTUAL, // Register C is atomic reference
|
Opcode.INVOKE_VIRTUAL, // Register C is atomic reference
|
||||||
Opcode.MOVE_RESULT_OBJECT, // Register A is char sequence
|
Opcode.MOVE_RESULT_OBJECT, // Register A is char sequence
|
||||||
Opcode.MOVE_OBJECT,
|
|
||||||
Opcode.CHECK_CAST,
|
Opcode.CHECK_CAST,
|
||||||
Opcode.MOVE_OBJECT,
|
Opcode.MOVE_OBJECT, // Replace this instruction with patch code
|
||||||
Opcode.INVOKE_INTERFACE, // Insert hook here
|
Opcode.INVOKE_INTERFACE,
|
||||||
Opcode.MOVE_RESULT,
|
Opcode.MOVE_RESULT,
|
||||||
Opcode.IF_EQZ,
|
Opcode.IF_EQZ,
|
||||||
Opcode.INVOKE_INTERFACE,
|
Opcode.INVOKE_INTERFACE,
|
||||||
|
|||||||
@@ -13,12 +13,14 @@ object TextComponentContextFingerprint : MethodFingerprint(
|
|||||||
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
||||||
parameters = listOf("L"),
|
parameters = listOf("L"),
|
||||||
opcodes = listOf(
|
opcodes = listOf(
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.INVOKE_STATIC_RANGE,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
Opcode.IGET_OBJECT, // conversion context field name
|
Opcode.IGET_OBJECT, // conversion context field name
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.IGET_BOOLEAN,
|
|
||||||
Opcode.IGET,
|
|
||||||
Opcode.IGET,
|
|
||||||
Opcode.IGET,
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -27,7 +27,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -44,7 +44,8 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -28,7 +28,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -33,7 +33,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -25,7 +25,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -29,7 +29,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -55,7 +55,8 @@ object SpoofSignaturePatch : BytecodePatch(
|
|||||||
"App signature spoofed\\n\\n"
|
"App signature spoofed\\n\\n"
|
||||||
+ "Side effects include:\\n"
|
+ "Side effects include:\\n"
|
||||||
+ "• Enhanced bitrate is not available\\n"
|
+ "• Enhanced bitrate is not available\\n"
|
||||||
+ "• Videos cannot be downloaded"
|
+ "• Videos cannot be downloaded\\n"
|
||||||
|
+ "• No seekbar thumbnails for paid videos"
|
||||||
),
|
),
|
||||||
StringResource(
|
StringResource(
|
||||||
"revanced_spoof_signature_verification_enabled_summary_off",
|
"revanced_spoof_signature_verification_enabled_summary_off",
|
||||||
@@ -78,7 +79,7 @@ object SpoofSignaturePatch : BytecodePatch(
|
|||||||
),
|
),
|
||||||
StringResource(
|
StringResource(
|
||||||
"revanced_spoof_signature_in_feed_enabled_summary_off",
|
"revanced_spoof_signature_in_feed_enabled_summary_off",
|
||||||
"App signature not spoofed for feed videos\n\n"
|
"App signature not spoofed for feed videos\\n\\n"
|
||||||
+ "Feed videos will play for less than 1 minute before encountering playback issues"
|
+ "Feed videos will play for less than 1 minute before encountering playback issues"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -89,9 +90,8 @@ object SpoofSignaturePatch : BytecodePatch(
|
|||||||
// Hook the player parameters.
|
// Hook the player parameters.
|
||||||
PlayerResponseMethodHookPatch.injectProtoBufferHook("$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;)Ljava/lang/String;")
|
PlayerResponseMethodHookPatch.injectProtoBufferHook("$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;)Ljava/lang/String;")
|
||||||
|
|
||||||
// Force the seekbar thumbnails to show up.
|
// Force the seekbar time and chapters to always show up.
|
||||||
// This is only required to show the seekbar time and chapters
|
// This is used only if the storyboard spec fetch fails, or when viewing paid videos.
|
||||||
// if the storyboard spec fetch fails.
|
|
||||||
StoryboardThumbnailParentFingerprint.result?.classDef?.let { classDef ->
|
StoryboardThumbnailParentFingerprint.result?.classDef?.let { classDef ->
|
||||||
StoryboardThumbnailFingerprint.also {
|
StoryboardThumbnailFingerprint.also {
|
||||||
it.resolve(
|
it.resolve(
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
package app.revanced.patches.youtube.misc.links
|
||||||
|
|
||||||
|
import app.revanced.extensions.exception
|
||||||
|
import app.revanced.patcher.data.BytecodeContext
|
||||||
|
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
|
||||||
|
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
|
||||||
|
import app.revanced.patcher.patch.BytecodePatch
|
||||||
|
import app.revanced.patcher.patch.annotation.CompatiblePackage
|
||||||
|
import app.revanced.patcher.patch.annotation.Patch
|
||||||
|
import app.revanced.patches.shared.settings.preference.impl.StringResource
|
||||||
|
import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
|
||||||
|
import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
|
||||||
|
import app.revanced.patches.youtube.misc.links.fingerprints.OpenLinksDirectlyPrimaryFingerprint
|
||||||
|
import app.revanced.patches.youtube.misc.links.fingerprints.OpenLinksDirectlySecondaryFingerprint
|
||||||
|
import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
||||||
|
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
|
||||||
|
|
||||||
|
@Patch(
|
||||||
|
name = "Bypass URL redirects",
|
||||||
|
description = "Bypass URL redirects and open the original URL directly.",
|
||||||
|
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",
|
||||||
|
"18.37.36"
|
||||||
|
]
|
||||||
|
)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
object BypassURLRedirectsPatch : BytecodePatch(
|
||||||
|
setOf(OpenLinksDirectlyPrimaryFingerprint, OpenLinksDirectlySecondaryFingerprint)
|
||||||
|
) {
|
||||||
|
override fun execute(context: BytecodeContext) {
|
||||||
|
SettingsPatch.PreferenceScreen.MISC.addPreferences(
|
||||||
|
SwitchPreference(
|
||||||
|
"revanced_bypass_url_redirects",
|
||||||
|
StringResource("revanced_bypass_url_redirects_title", "Bypass URL redirects"),
|
||||||
|
StringResource("revanced_bypass_url_redirects_summary_on", "URL redirects are bypassed"),
|
||||||
|
StringResource("revanced_bypass_url_redirects_summary_off", "URL redirects are not bypassed"),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
arrayOf(
|
||||||
|
OpenLinksDirectlyPrimaryFingerprint,
|
||||||
|
OpenLinksDirectlySecondaryFingerprint
|
||||||
|
).map {
|
||||||
|
it.result ?: throw it.exception
|
||||||
|
}.forEach { result ->
|
||||||
|
result.mutableMethod.apply {
|
||||||
|
val insertIndex = result.scanResult.patternScanResult!!.startIndex
|
||||||
|
val uriStringRegister = getInstruction<FiveRegisterInstruction>(insertIndex).registerC
|
||||||
|
|
||||||
|
replaceInstruction(
|
||||||
|
insertIndex,
|
||||||
|
"invoke-static {v$uriStringRegister}," +
|
||||||
|
"Lapp/revanced/integrations/patches/BypassURLRedirectsPatch;" +
|
||||||
|
"->" +
|
||||||
|
"parseRedirectUri(Ljava/lang/String;)Landroid/net/Uri;"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,7 +19,20 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
|
|||||||
@Patch(
|
@Patch(
|
||||||
name = "Open links externally",
|
name = "Open links externally",
|
||||||
description = "Open links outside of the app directly in your browser.",
|
description = "Open links outside of the app directly in your browser.",
|
||||||
compatiblePackages = [CompatiblePackage("com.google.android.youtube", ["18.16.37", "18.19.35", "18.20.39", "18.23.35", "18.29.38", "18.32.39"])]
|
compatiblePackages = [
|
||||||
|
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"
|
||||||
|
]
|
||||||
|
)
|
||||||
|
]
|
||||||
)
|
)
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
object OpenLinksExternallyPatch : AbstractTransformInstructionsPatch<Pair<Int, Int>>(
|
object OpenLinksExternallyPatch : AbstractTransformInstructionsPatch<Pair<Int, Int>>(
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package app.revanced.patches.youtube.misc.links.fingerprints
|
||||||
|
|
||||||
|
import app.revanced.patcher.extensions.or
|
||||||
|
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||||
|
import com.android.tools.smali.dexlib2.AccessFlags
|
||||||
|
import com.android.tools.smali.dexlib2.Opcode
|
||||||
|
|
||||||
|
object OpenLinksDirectlyPrimaryFingerprint : MethodFingerprint(
|
||||||
|
returnType = "Ljava/lang/Object",
|
||||||
|
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
||||||
|
parameters = listOf("Ljava/lang/Object"),
|
||||||
|
opcodes = listOf(
|
||||||
|
Opcode.INVOKE_STATIC,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
Opcode.RETURN_OBJECT,
|
||||||
|
Opcode.CHECK_CAST,
|
||||||
|
Opcode.SGET,
|
||||||
|
Opcode.SGET_OBJECT
|
||||||
|
)
|
||||||
|
)
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package app.revanced.patches.youtube.misc.links.fingerprints
|
||||||
|
|
||||||
|
import app.revanced.patcher.extensions.or
|
||||||
|
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||||
|
import com.android.tools.smali.dexlib2.AccessFlags
|
||||||
|
import com.android.tools.smali.dexlib2.Opcode
|
||||||
|
|
||||||
|
object OpenLinksDirectlySecondaryFingerprint : MethodFingerprint(
|
||||||
|
returnType = "Landroid/net/Uri",
|
||||||
|
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
|
||||||
|
parameters = listOf("Ljava/lang/String"),
|
||||||
|
opcodes = listOf(
|
||||||
|
Opcode.INVOKE_STATIC,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT
|
||||||
|
),
|
||||||
|
strings = listOf("://")
|
||||||
|
)
|
||||||
@@ -103,7 +103,7 @@ object LithoFilterPatch : BytecodePatch(
|
|||||||
val emptyComponentFieldIndex = builderMethodIndex + 2
|
val emptyComponentFieldIndex = builderMethodIndex + 2
|
||||||
|
|
||||||
bytesToComponentContextMethod.mutableMethod.apply {
|
bytesToComponentContextMethod.mutableMethod.apply {
|
||||||
val insertHookIndex = bytesToComponentContextMethod.scanResult.patternScanResult!!.endIndex
|
val insertHookIndex = bytesToComponentContextMethod.scanResult.patternScanResult!!.endIndex + 1
|
||||||
|
|
||||||
// region Get free registers that this patch uses.
|
// region Get free registers that this patch uses.
|
||||||
// Registers are overwritten right after they are used in this patch, therefore free to clobber.
|
// Registers are overwritten right after they are used in this patch, therefore free to clobber.
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import com.android.tools.smali.dexlib2.Opcode
|
|||||||
|
|
||||||
object ComponentContextParserFingerprint : MethodFingerprint(
|
object ComponentContextParserFingerprint : MethodFingerprint(
|
||||||
opcodes = listOf(
|
opcodes = listOf(
|
||||||
|
Opcode.INVOKE_VIRTUAL,
|
||||||
Opcode.INVOKE_VIRTUAL,
|
Opcode.INVOKE_VIRTUAL,
|
||||||
Opcode.IPUT_OBJECT,
|
Opcode.IPUT_OBJECT,
|
||||||
Opcode.NEW_INSTANCE
|
|
||||||
),
|
),
|
||||||
strings = listOf("Component was not found %s because it was removed due to duplicate converter bindings.")
|
strings = listOf("Component was not found %s because it was removed due to duplicate converter bindings.")
|
||||||
)
|
)
|
||||||
@@ -14,7 +14,7 @@ import app.revanced.util.microg.MicroGBytecodeHelper
|
|||||||
|
|
||||||
@Patch(
|
@Patch(
|
||||||
name = "Vanced MicroG support",
|
name = "Vanced MicroG support",
|
||||||
description = "Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG.",
|
description = "Allows YouTube to run without root and under a different package name with Vanced MicroG.",
|
||||||
dependencies = [
|
dependencies = [
|
||||||
MicroGResourcePatch::class,
|
MicroGResourcePatch::class,
|
||||||
HideCastButtonPatch::class,
|
HideCastButtonPatch::class,
|
||||||
@@ -28,7 +28,8 @@ import app.revanced.util.microg.MicroGBytecodeHelper
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -34,7 +34,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -36,7 +36,8 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ object SetQualityByIndexMethodClassFieldReferenceFingerprint : MethodFingerprint
|
|||||||
parameters = listOf("L"),
|
parameters = listOf("L"),
|
||||||
opcodes = listOf(
|
opcodes = listOf(
|
||||||
Opcode.IGET_OBJECT,
|
Opcode.IGET_OBJECT,
|
||||||
Opcode.INVOKE_INTERFACE,
|
Opcode.IPUT_OBJECT,
|
||||||
Opcode.RETURN_VOID
|
Opcode.IGET_OBJECT,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -18,7 +18,8 @@ import app.revanced.patches.youtube.video.speed.remember.RememberPlaybackSpeedPa
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -28,7 +28,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user