mirror of
https://github.com/inotia00/revanced-patches.git
synced 2025-04-30 06:34:37 +02:00
fix(YouTube Music/Intent hook): infinite loop due to dependency conflict
This commit is contained in:
parent
82c4d367b8
commit
3fb9cf01c5
@ -14,7 +14,6 @@ import app.revanced.patches.music.actionbar.component.fingerprints.ActionBarComp
|
|||||||
import app.revanced.patches.music.actionbar.component.fingerprints.LikeDislikeContainerFingerprint
|
import app.revanced.patches.music.actionbar.component.fingerprints.LikeDislikeContainerFingerprint
|
||||||
import app.revanced.patches.music.actionbar.component.fingerprints.LikeDislikeContainerVisibilityFingerprint
|
import app.revanced.patches.music.actionbar.component.fingerprints.LikeDislikeContainerVisibilityFingerprint
|
||||||
import app.revanced.patches.music.utils.integrations.Constants.ACTIONBAR
|
import app.revanced.patches.music.utils.integrations.Constants.ACTIONBAR
|
||||||
import app.revanced.patches.music.utils.intenthook.IntentHookPatch
|
|
||||||
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
|
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
|
||||||
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.LikeDislikeContainer
|
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.LikeDislikeContainer
|
||||||
import app.revanced.patches.music.utils.settings.CategoryType
|
import app.revanced.patches.music.utils.settings.CategoryType
|
||||||
@ -34,7 +33,6 @@ import kotlin.math.min
|
|||||||
name = "Hide action bar component",
|
name = "Hide action bar component",
|
||||||
description = "Adds options to hide action bar components and replace the offline download button with an external download button.",
|
description = "Adds options to hide action bar components and replace the offline download button with an external download button.",
|
||||||
dependencies = [
|
dependencies = [
|
||||||
IntentHookPatch::class,
|
|
||||||
SettingsPatch::class,
|
SettingsPatch::class,
|
||||||
SharedResourceIdPatch::class,
|
SharedResourceIdPatch::class,
|
||||||
VideoInformationPatch::class
|
VideoInformationPatch::class
|
||||||
|
@ -5,7 +5,6 @@ import app.revanced.patcher.patch.annotation.CompatiblePackage
|
|||||||
import app.revanced.patcher.patch.annotation.Patch
|
import app.revanced.patcher.patch.annotation.Patch
|
||||||
import app.revanced.patches.music.general.oldstylelibraryshelf.OldStyleLibraryShelfPatch
|
import app.revanced.patches.music.general.oldstylelibraryshelf.OldStyleLibraryShelfPatch
|
||||||
import app.revanced.patches.music.utils.integrations.Constants.MISC_PATH
|
import app.revanced.patches.music.utils.integrations.Constants.MISC_PATH
|
||||||
import app.revanced.patches.music.utils.intenthook.IntentHookPatch
|
|
||||||
import app.revanced.patches.music.utils.settings.CategoryType
|
import app.revanced.patches.music.utils.settings.CategoryType
|
||||||
import app.revanced.patches.music.utils.settings.SettingsPatch
|
import app.revanced.patches.music.utils.settings.SettingsPatch
|
||||||
import app.revanced.patches.music.utils.settings.SettingsPatch.contexts
|
import app.revanced.patches.music.utils.settings.SettingsPatch.contexts
|
||||||
@ -17,7 +16,6 @@ import app.revanced.util.copyXmlNode
|
|||||||
description = "Adds options to spoof the YouTube Music client version. " +
|
description = "Adds options to spoof the YouTube Music client version. " +
|
||||||
"This can remove the radio mode restriction in Canadian regions or disable real-time lyrics.",
|
"This can remove the radio mode restriction in Canadian regions or disable real-time lyrics.",
|
||||||
dependencies = [
|
dependencies = [
|
||||||
IntentHookPatch::class,
|
|
||||||
OldStyleLibraryShelfPatch::class,
|
OldStyleLibraryShelfPatch::class,
|
||||||
SettingsPatch::class
|
SettingsPatch::class
|
||||||
],
|
],
|
||||||
|
@ -7,11 +7,14 @@ import app.revanced.patcher.patch.BytecodePatch
|
|||||||
import app.revanced.patcher.patch.annotation.Patch
|
import app.revanced.patcher.patch.annotation.Patch
|
||||||
import app.revanced.patcher.util.smali.ExternalLabel
|
import app.revanced.patcher.util.smali.ExternalLabel
|
||||||
import app.revanced.patches.music.utils.integrations.Constants.INTEGRATIONS_PATH
|
import app.revanced.patches.music.utils.integrations.Constants.INTEGRATIONS_PATH
|
||||||
|
import app.revanced.patches.music.utils.integrations.IntegrationsPatch
|
||||||
import app.revanced.patches.music.utils.intenthook.fingerprints.GoogleApiActivityFingerprint
|
import app.revanced.patches.music.utils.intenthook.fingerprints.GoogleApiActivityFingerprint
|
||||||
import app.revanced.patches.music.utils.settings.SettingsPatch
|
|
||||||
import app.revanced.util.exception
|
import app.revanced.util.exception
|
||||||
|
|
||||||
@Patch(dependencies = [SettingsPatch::class])
|
@Patch(
|
||||||
|
dependencies = [IntegrationsPatch::class],
|
||||||
|
requiresIntegrations = true
|
||||||
|
)
|
||||||
object IntentHookPatch : BytecodePatch(
|
object IntentHookPatch : BytecodePatch(
|
||||||
setOf(GoogleApiActivityFingerprint)
|
setOf(GoogleApiActivityFingerprint)
|
||||||
) {
|
) {
|
||||||
|
@ -4,7 +4,6 @@ import app.revanced.patcher.data.ResourceContext
|
|||||||
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 app.revanced.patches.music.utils.intenthook.IntentHookPatch
|
|
||||||
import app.revanced.patches.music.utils.settings.ResourceUtils
|
import app.revanced.patches.music.utils.settings.ResourceUtils
|
||||||
import app.revanced.patches.music.utils.settings.ResourceUtils.hookPreference
|
import app.revanced.patches.music.utils.settings.ResourceUtils.hookPreference
|
||||||
import app.revanced.patches.music.utils.settings.SettingsPatch
|
import app.revanced.patches.music.utils.settings.SettingsPatch
|
||||||
@ -15,7 +14,6 @@ import app.revanced.util.copyResources
|
|||||||
name = "SponsorBlock",
|
name = "SponsorBlock",
|
||||||
description = "Adds options to enable and configure SponsorBlock, which can skip undesired video segments such as non-music sections.",
|
description = "Adds options to enable and configure SponsorBlock, which can skip undesired video segments such as non-music sections.",
|
||||||
dependencies = [
|
dependencies = [
|
||||||
IntentHookPatch::class,
|
|
||||||
SettingsPatch::class,
|
SettingsPatch::class,
|
||||||
SponsorBlockBytecodePatch::class
|
SponsorBlockBytecodePatch::class
|
||||||
],
|
],
|
||||||
|
@ -4,7 +4,6 @@ import app.revanced.patcher.data.BytecodeContext
|
|||||||
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 app.revanced.patches.music.utils.integrations.Constants.VIDEO_PATH
|
import app.revanced.patches.music.utils.integrations.Constants.VIDEO_PATH
|
||||||
import app.revanced.patches.music.utils.intenthook.IntentHookPatch
|
|
||||||
import app.revanced.patches.music.utils.settings.CategoryType
|
import app.revanced.patches.music.utils.settings.CategoryType
|
||||||
import app.revanced.patches.music.utils.settings.SettingsPatch
|
import app.revanced.patches.music.utils.settings.SettingsPatch
|
||||||
import app.revanced.patches.shared.patch.customspeed.AbstractCustomPlaybackSpeedPatch
|
import app.revanced.patches.shared.patch.customspeed.AbstractCustomPlaybackSpeedPatch
|
||||||
@ -12,7 +11,7 @@ import app.revanced.patches.shared.patch.customspeed.AbstractCustomPlaybackSpeed
|
|||||||
@Patch(
|
@Patch(
|
||||||
name = "Custom playback speed",
|
name = "Custom playback speed",
|
||||||
description = "Adds an option to customize available playback speeds.",
|
description = "Adds an option to customize available playback speeds.",
|
||||||
dependencies = [IntentHookPatch::class],
|
dependencies = [SettingsPatch::class],
|
||||||
compatiblePackages = [
|
compatiblePackages = [
|
||||||
CompatiblePackage(
|
CompatiblePackage(
|
||||||
"com.google.android.apps.youtube.music",
|
"com.google.android.apps.youtube.music",
|
||||||
|
@ -2,7 +2,6 @@ package app.revanced.patches.music.video.videoid
|
|||||||
|
|
||||||
import app.revanced.patcher.data.BytecodeContext
|
import app.revanced.patcher.data.BytecodeContext
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
|
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
|
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
|
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
|
||||||
|
Loading…
x
Reference in New Issue
Block a user