ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-06-12 21:27:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge ReX into RVX (#19)

Browse Source 
* feat(youtube/shorts): Hide pivot button

* feat(youtube/hide-button-container): Hide Actions button

* feat(youtube): Alternative video thumbnails

* feat(youtube/layout): Hide reminder button

* feat(youtube/player-flyout-panels): Hide flyout panel footer

* Update string

* feat(youtube/whitelist): rollback whitelist feature

* fix(youtube/settings): lexicographic sorting

* fix(youtube/alternative-thumbnails): remove unused code

---------

Co-authored-by: inotia00 <108592928+inotia00@users.noreply.github.com>
This commit is contained in:
Hoàng Gia Bảo
2023-09-28 01:40:33 +07:00
committed by GitHub
parent 72a947b86a
commit 63b7812dc3
9 changed files with 248 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/fingerprints/CronetURLRequestCallbackOnResponseStartedFingerprint.kt Normal file
View File

@ -0,0 +1,21 @@
package app.revanced.patches.youtube.alternativethumbnails.general.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
// Acts as a parent fingerprint.
object CronetURLRequestCallbackOnResponseStartedFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Lorg/chromium/net/UrlRequest;", "Lorg/chromium/net/UrlResponseInfo;"),
strings = listOf(
"Content-Length",
"Content-Type",
"identity",
"application/x-protobuf"
),
customFingerprint = { methodDef, _ ->
methodDef.name == "onResponseStarted"
}
)

14
src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/fingerprints/CronetURLRequestCallbackOnSucceededFingerprint.kt.kt Normal file
View File

@ -0,0 +1,14 @@
package app.revanced.patches.youtube.alternativethumbnails.general.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
object CronetURLRequestCallbackOnSucceededFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Lorg/chromium/net/UrlRequest;", "Lorg/chromium/net/UrlResponseInfo;"),
customFingerprint = { methodDef, _ ->
methodDef.name == "onSucceeded"
}
)

10
src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/fingerprints/MessageDigestImageUrlFingerprint.kt Normal file
View File

@ -0,0 +1,10 @@
package app.revanced.patches.youtube.alternativethumbnails.general.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
object MessageDigestImageUrlFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
parameters = listOf("Ljava/lang/String;", "L")
)

12
src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/fingerprints/MessageDigestImageUrlParentFingerprint.kt Normal file
View File

@ -0,0 +1,12 @@
package app.revanced.patches.youtube.alternativethumbnails.general.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
object MessageDigestImageUrlParentFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
returnType = "Ljava/lang/String;",
parameters = emptyList(),
strings = listOf("@#&=*+-_.,:!?()/~'%;\$"),
)

98
src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/patch/AlternativeThumbnailsPatch.kt Normal file
View File

@ -0,0 +1,98 @@
package app.revanced.patches.youtube.alternativethumbnails.general.patch
import app.revanced.extensions.exception
import app.revanced.patcher.annotation.Description
import app.revanced.patcher.annotation.Name
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.youtube.alternativethumbnails.general.fingerprints.CronetURLRequestCallbackOnResponseStartedFingerprint
import app.revanced.patches.youtube.alternativethumbnails.general.fingerprints.CronetURLRequestCallbackOnSucceededFingerprint
import app.revanced.patches.youtube.alternativethumbnails.general.fingerprints.MessageDigestImageUrlFingerprint
import app.revanced.patches.youtube.alternativethumbnails.general.fingerprints.MessageDigestImageUrlParentFingerprint
import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch.Companion.contexts
import app.revanced.util.resources.ResourceUtils.copyXmlNode
@Patch
@Name("Alternative thumbnails")
@Description("Adds an option to replace video thumbnails with still image captures of the video.")
@DependsOn([SettingsPatch::class])
@YouTubeCompatibility
class AlternativeThumbnailsPatch : BytecodePatch(
listOf(
CronetURLRequestCallbackOnResponseStartedFingerprint,
MessageDigestImageUrlParentFingerprint
)
) {
override fun execute(context: BytecodeContext) {
/**
* Hook should should come first.
*/
MessageDigestImageUrlParentFingerprint.result?.let { parentResult ->
MessageDigestImageUrlFingerprint.also {
it.resolve(
context,
parentResult.classDef
)
}.result?.let {
it.mutableMethod.apply {
addInstructions(
0, """
invoke-static { p1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->overrideImageURL(Ljava/lang/String;)Ljava/lang/String;
move-result-object p1
"""
)
}
} ?: throw MessageDigestImageUrlFingerprint.exception
} ?: throw MessageDigestImageUrlParentFingerprint.exception
/**
* If a connection completed, which includes normal 200 responses but also includes
* status 404 and other error like http responses.
*/
CronetURLRequestCallbackOnResponseStartedFingerprint.result?.let { parentResult ->
CronetURLRequestCallbackOnSucceededFingerprint.also {
it.resolve(
context,
parentResult.classDef
)
}.result?.let {
it.mutableMethod.apply {
addInstruction(
0,
"invoke-static { p2 }, $INTEGRATIONS_CLASS_DESCRIPTOR->handleCronetSuccess(Lorg/chromium/net/UrlResponseInfo;)V"
)
}
} ?: throw CronetURLRequestCallbackOnSucceededFingerprint.exception
} ?: throw CronetURLRequestCallbackOnResponseStartedFingerprint.exception
/**
* Copy arrays
*/
contexts.copyXmlNode("youtube/alternativethumbnails/host", "values/arrays.xml", "resources")
/**
* Add settings
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: ALTERNATIVE_THUMBNAILS_SETTINGS"
)
)
SettingsPatch.updatePatchStatus("alternative-thumbnails")
}
internal companion object {
private const val INTEGRATIONS_CLASS_DESCRIPTOR =
"Lapp/revanced/integrations/alternativethumbnails/AlternativeThumbnailsPatch;"
}
}

1
src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/patch/PlayerFlyoutPanelPatch.kt
View File

@ -24,6 +24,7 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
class PlayerFlyoutPanelPatch : ResourcePatch {
override fun execute(context: ResourceContext) {
LithoFilterPatch.addFilter("$PATCHES_PATH/ads/PlayerFlyoutPanelsFilter;")
LithoFilterPatch.addFilter("$PATCHES_PATH/ads/PlayerFlyoutPanelsFooterFilter;")
/**
* Add settings