ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-23 18:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: lint code

Browse Source
This commit is contained in:
inotia00 2024-09-15 20:21:41 +09:00
parent 80727591ae
commit 5e8d280294
11 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt
View File

@ -198,7 +198,11 @@ object CustomBrandingIconPatch : BaseResourcePatch(
if (oldSplashIconNotExists) {
splashIconResourceGroups.let { resourceGroups ->
resourceGroups.forEach {
context.copyResources("$youtubeMusicIconResourcePath/splash", it, createDirectoryIfNotExist = true)
context.copyResources(
"$youtubeMusicIconResourcePath/splash",
it,
createDirectoryIfNotExist = true
)
}
}
}

10
src/main/kotlin/app/revanced/patches/shared/ads/BaseAdsPatch.kt
View File

@ -32,6 +32,11 @@ abstract class BaseAdsPatch(
VideoAdsFingerprint
)
) {
private companion object {
const val INTEGRATIONS_CLASS_DESCRIPTOR =
"$PATCHES_PATH/FullscreenAdsPatch;"
}
override fun execute(context: BytecodeContext) {
MusicAdsFingerprint.resultOrThrow().let {
it.mutableMethod.apply {
@ -119,9 +124,4 @@ abstract class BaseAdsPatch(
)
}
}
private companion object {
const val INTEGRATIONS_CLASS_DESCRIPTOR =
"$PATCHES_PATH/FullscreenAdsPatch;"
}
}

3
src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt
View File

@ -180,7 +180,8 @@ object ToolBarComponentsPatch : BaseBytecodePatch(
"invoke-static {v$viewRegister}, $GENERAL_CLASS_DESCRIPTOR->setWideSearchBarLayout(Landroid/view/View;)V"
)
val targetIndex = ActionBarRingoBackgroundFingerprint.indexOfStaticInstruction(this) + 1
val targetIndex =
ActionBarRingoBackgroundFingerprint.indexOfStaticInstruction(this) + 1
val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
injectSearchBarHook(

4
src/main/kotlin/app/revanced/patches/youtube/general/toolbar/fingerprints/ActionBarRingoTextFingerprint.kt
View File

@ -2,8 +2,8 @@ package app.revanced.patches.youtube.general.toolbar.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import app.revanced.patches.youtube.general.toolbar.fingerprints.ActionBarRingoTextFingerprint.indexOfStaticInstruction
import app.revanced.patches.youtube.general.toolbar.fingerprints.ActionBarRingoTextFingerprint.indexOfStartDelayInstruction
import app.revanced.patches.youtube.general.toolbar.fingerprints.ActionBarRingoTextFingerprint.indexOfStaticInstruction
import app.revanced.util.getReference
import app.revanced.util.indexOfFirstInstruction
import app.revanced.util.indexOfFirstInstructionReversed
@ -26,7 +26,7 @@ internal object ActionBarRingoTextFingerprint : MethodFingerprint(
}
fun indexOfStaticInstruction(methodDef: Method) =
methodDef.indexOfFirstInstructionReversed (indexOfStartDelayInstruction(methodDef)) {
methodDef.indexOfFirstInstructionReversed(indexOfStartDelayInstruction(methodDef)) {
val reference = getReference<MethodReference>()
opcode == Opcode.INVOKE_STATIC &&
reference?.parameterTypes?.size == 1 &&

5
src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt
View File

@ -45,7 +45,7 @@ object BackgroundPlaybackPatch : BaseBytecodePatch(
override fun execute(context: BytecodeContext) {
BackgroundPlaybackManagerFingerprint.resultOrThrow().mutableMethod.apply {
findOpcodeIndicesReversed(Opcode.RETURN).forEach{ index ->
findOpcodeIndicesReversed(Opcode.RETURN).forEach { index ->
val register = getInstruction<OneRegisterInstruction>(index).registerA
// Replace to preserve control flow label.
@ -54,7 +54,8 @@ object BackgroundPlaybackPatch : BaseBytecodePatch(
"invoke-static { v$register }, $MISC_PATH/BackgroundPlaybackPatch;->allowBackgroundPlayback(Z)Z"
)
addInstructions(index + 1,
addInstructions(
index + 1,
"""
move-result v$register
return v$register

9
src/main/kotlin/app/revanced/patches/youtube/utils/PlayerResponseModelUtils.kt
View File

@ -10,8 +10,9 @@ internal object PlayerResponseModelUtils {
const val PLAYER_RESPONSE_MODEL_CLASS_DESCRIPTOR =
"Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"
fun indexOfPlayerResponseModelInstruction(methodDef: Method) = methodDef.indexOfFirstInstruction {
opcode == Opcode.INVOKE_INTERFACE &&
getReference<MethodReference>()?.definingClass == PLAYER_RESPONSE_MODEL_CLASS_DESCRIPTOR
}
fun indexOfPlayerResponseModelInstruction(methodDef: Method) =
methodDef.indexOfFirstInstruction {
opcode == Opcode.INVOKE_INTERFACE &&
getReference<MethodReference>()?.definingClass == PLAYER_RESPONSE_MODEL_CLASS_DESCRIPTOR
}
}

2
src/main/kotlin/app/revanced/patches/youtube/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
View File

@ -222,7 +222,7 @@ object SpoofStreamingDataPatch : BaseBytecodePatch(
// region Append spoof info.
NerdsStatsVideoFormatBuilderFingerprint.resultOrThrow().mutableMethod.apply {
findOpcodeIndicesReversed(Opcode.RETURN_OBJECT).forEach{ index ->
findOpcodeIndicesReversed(Opcode.RETURN_OBJECT).forEach { index ->
val register = getInstruction<OneRegisterInstruction>(index).registerA
addInstructions(

1
src/main/kotlin/app/revanced/patches/youtube/utils/playertype/PlayerTypeHookPatch.kt
View File

@ -18,7 +18,6 @@ import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
import app.revanced.util.addFieldAndInstructions
import app.revanced.util.getStringInstructionIndex
import app.revanced.util.getTargetIndexOrThrow
import app.revanced.util.getTargetIndexWithMethodReferenceNameOrThrow
import app.revanced.util.resultOrThrow
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction

9
src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt
View File

@ -274,10 +274,13 @@ object VideoInformationPatch : BytecodePatch(
/**
* Set current video information
*/
channelIdMethodCall = ChannelIdFingerprint.getPlayerResponseInstruction("Ljava/lang/String;")
channelNameMethodCall = ChannelNameFingerprint.getPlayerResponseInstruction("Ljava/lang/String;")
channelIdMethodCall =
ChannelIdFingerprint.getPlayerResponseInstruction("Ljava/lang/String;")
channelNameMethodCall =
ChannelNameFingerprint.getPlayerResponseInstruction("Ljava/lang/String;")
videoIdMethodCall = VideoIdFingerprint.getPlayerResponseInstruction("Ljava/lang/String;")
videoTitleMethodCall = VideoTitleFingerprint.getPlayerResponseInstruction("Ljava/lang/String;")
videoTitleMethodCall =
VideoTitleFingerprint.getPlayerResponseInstruction("Ljava/lang/String;")
videoLengthMethodCall = VideoLengthFingerprint.getPlayerResponseInstruction("J")
videoIsLiveMethodCall = ChannelIdFingerprint.getPlayerResponseInstruction("Z")

9
src/main/kotlin/app/revanced/patches/youtube/video/information/fingerprints/PlaybackInitializationFingerprint.kt
View File

@ -20,8 +20,9 @@ internal object PlaybackInitializationFingerprint : MethodFingerprint(
indexOfPlayerResponseModelInstruction(methodDef) >= 0
}
) {
fun indexOfPlayerResponseModelInstruction(methodDef: Method) = methodDef.indexOfFirstInstruction {
opcode == Opcode.INVOKE_DIRECT &&
getReference<MethodReference>()?.returnType == PLAYER_RESPONSE_MODEL_CLASS_DESCRIPTOR
}
fun indexOfPlayerResponseModelInstruction(methodDef: Method) =
methodDef.indexOfFirstInstruction {
opcode == Opcode.INVOKE_DIRECT &&
getReference<MethodReference>()?.returnType == PLAYER_RESPONSE_MODEL_CLASS_DESCRIPTOR
}
}

18
src/main/kotlin/app/revanced/util/BytecodeUtils.kt
View File

@ -291,7 +291,10 @@ fun Method.indexOfFirstInstructionReversed(startIndex: Int? = null, targetOpcode
* @return -1 if the instruction is not found.
* @see indexOfFirstInstructionReversedOrThrow
*/
fun Method.indexOfFirstInstructionReversed(startIndex: Int? = null, predicate: Instruction.() -> Boolean): Int {
fun Method.indexOfFirstInstructionReversed(
startIndex: Int? = null,
predicate: Instruction.() -> Boolean
): Int {
var instructions = this.implementation!!.instructions
if (startIndex != null) {
instructions = instructions.take(startIndex + 1)
@ -308,7 +311,10 @@ fun Method.indexOfFirstInstructionReversed(startIndex: Int? = null, predicate: I
* @return -1 if the instruction is not found.
* @see indexOfFirstInstructionReversed
*/
fun Method.indexOfFirstInstructionReversedOrThrow(startIndex: Int? = null, targetOpcode: Opcode): Int =
fun Method.indexOfFirstInstructionReversedOrThrow(
startIndex: Int? = null,
targetOpcode: Opcode
): Int =
indexOfFirstInstructionReversedOrThrow(startIndex) {
opcode == targetOpcode
}
@ -321,7 +327,10 @@ fun Method.indexOfFirstInstructionReversedOrThrow(startIndex: Int? = null, targe
* @return -1 if the instruction is not found.
* @see indexOfFirstInstructionReversed
*/
fun Method.indexOfFirstInstructionReversedOrThrow(startIndex: Int? = null, predicate: Instruction.() -> Boolean): Int {
fun Method.indexOfFirstInstructionReversedOrThrow(
startIndex: Int? = null,
predicate: Instruction.() -> Boolean
): Int {
val index = indexOfFirstInstructionReversed(startIndex, predicate)
if (index < 0) {
@ -424,7 +433,8 @@ inline fun <reified T : Reference> Instruction.getReference() =
* @param predicate The predicate to match.
* @return The index of the first [Instruction] that matches the predicate.
*/
fun Method.indexOfFirstInstruction(predicate: Instruction.() -> Boolean) = indexOfFirstInstruction(0, predicate)
fun Method.indexOfFirstInstruction(predicate: Instruction.() -> Boolean) =
indexOfFirstInstruction(0, predicate)
/**
* Get the index of the first [Instruction] that matches the predicate, starting from [startIndex].