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

fix(YouTube Music/SponsorBlock): when the app is in the background, segments are not fetched

Browse Source
This commit is contained in:
inotia00
2023-11-07 21:36:12 +09:00
parent 8929cb9edb
commit bb47c3fe43
3 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/kotlin/app/revanced/patches/music/video/information/VideoInformationPatch.kt
View File

@ -14,6 +14,7 @@ import app.revanced.patches.music.utils.fingerprints.SeekBarConstructorFingerpri
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.video.information.fingerprints.PlayerControllerSetTimeReferenceFingerprint import app.revanced.patches.music.video.information.fingerprints.PlayerControllerSetTimeReferenceFingerprint
import app.revanced.patches.music.video.information.fingerprints.VideoEndFingerprint import app.revanced.patches.music.video.information.fingerprints.VideoEndFingerprint
import app.revanced.patches.music.video.information.fingerprints.VideoIdFingerprint
import app.revanced.patches.music.video.information.fingerprints.VideoIdParentFingerprint import app.revanced.patches.music.video.information.fingerprints.VideoIdParentFingerprint
import app.revanced.patches.music.video.information.fingerprints.VideoLengthFingerprint import app.revanced.patches.music.video.information.fingerprints.VideoLengthFingerprint
import app.revanced.util.integrations.Constants.MUSIC_VIDEO_PATH import app.revanced.util.integrations.Constants.MUSIC_VIDEO_PATH
@ -183,37 +184,22 @@ object VideoInformationPatch : BytecodePatch(
/** /**
* Inject call for video id * Inject call for video id
*/ */
VideoIdParentFingerprint.result?.let { VideoIdParentFingerprint.result?.let { parentResult ->
it.mutableMethod.apply { VideoIdFingerprint.also {
val targetIndex = it.scanResult.patternScanResult!!.endIndex it.resolve(
context,
val targetReference = getInstruction<ReferenceInstruction>(targetIndex).reference parentResult.classDef
val targetClass = (targetReference as FieldReference).type )
}.result?.let {
videoIdMethod = context it.mutableMethod.apply {
.findClass(targetClass)!! videoIdMethod = this
.mutableClass.methods.first { method -> videoIdIndex = it.scanResult.patternScanResult!!.endIndex
method.name == "handleVideoStageEvent" videoIdRegister = getInstruction<OneRegisterInstruction>(videoIdIndex).registerA
} }
} offset++ // offset so setVideoId is called before any injected call
} ?: throw VideoIdFingerprint.exception
} ?: throw VideoIdParentFingerprint.exception } ?: throw VideoIdParentFingerprint.exception
videoIdMethod.apply {
for (index in implementation!!.instructions.size - 1 downTo 0) {
if (getInstruction(index).opcode != Opcode.INVOKE_INTERFACE) continue
val targetReference = getInstruction<ReferenceInstruction>(index).reference
if (!targetReference.toString().endsWith("Ljava/lang/String;")) continue
videoIdIndex = index + 1
videoIdRegister = getInstruction<OneRegisterInstruction>(videoIdIndex).registerA
break
}
offset++ // offset so setVideoId is called before any injected call
}
/** /**
* Set current video id * Set current video id

16
src/main/kotlin/app/revanced/patches/music/video/information/fingerprints/VideoIdFingerprint.kt Normal file
View File

@ -0,0 +1,16 @@
package app.revanced.patches.music.video.information.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode
object VideoIdFingerprint : MethodFingerprint(
returnType = "V",
parameters = listOf("L", "L", "L"),
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
opcodes = listOf(
Opcode.INVOKE_INTERFACE,
Opcode.MOVE_RESULT_OBJECT
)
)

10
src/main/kotlin/app/revanced/patches/music/video/information/fingerprints/VideoIdParentFingerprint.kt
View File

@ -3,18 +3,10 @@ package app.revanced.patches.music.video.information.fingerprints
import app.revanced.patcher.extensions.or import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode
object VideoIdParentFingerprint : MethodFingerprint( object VideoIdParentFingerprint : MethodFingerprint(
returnType = "V", returnType = "V",
parameters = emptyList(), parameters = emptyList(),
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
opcodes = listOf( strings = listOf("currentWatchNextResponse")
Opcode.INVOKE_SUPER,
Opcode.IGET_OBJECT,
Opcode.CONST_4,
Opcode.IPUT_OBJECT,
Opcode.IGET_OBJECT
),
customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("/WatchFragment;") && methodDef.name == "onDestroyView" }
) )