From 0900686564a50151a736ed2368eec3e6a6cd9dfb Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 7 Dec 2024 23:54:47 +0100 Subject: [PATCH] add missing dependency --- .../all/misc/announcements/AnnouncementsPatch.kt | 10 ++++++---- .../music/misc/announcements/AnnouncementsPatch.kt | 2 ++ .../youtube/misc/announcements/AnnouncementsPatch.kt | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/patches/src/main/kotlin/app/revanced/patches/all/misc/announcements/AnnouncementsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/all/misc/announcements/AnnouncementsPatch.kt index cf419e717..604f3440a 100644 --- a/patches/src/main/kotlin/app/revanced/patches/all/misc/announcements/AnnouncementsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/all/misc/announcements/AnnouncementsPatch.kt @@ -2,9 +2,7 @@ package app.revanced.patches.all.misc.announcements import app.revanced.patcher.Fingerprint import app.revanced.patcher.extensions.InstructionExtensions.addInstructions -import app.revanced.patcher.patch.BytecodePatchBuilder -import app.revanced.patcher.patch.BytecodePatchContext -import app.revanced.patcher.patch.bytecodePatch +import app.revanced.patcher.patch.* import app.revanced.patches.all.misc.resources.addResources import app.revanced.patches.all.misc.resources.addResourcesPatch @@ -13,6 +11,7 @@ private const val EXTENSION_CLASS_DESCRIPTOR = fun announcementsPatch( mainActivityOnCreateFingerprint: Fingerprint, + extensionPatch: Patch<*>, block: BytecodePatchBuilder.() -> Unit = {}, executeBlock: BytecodePatchContext.() -> Unit = {}, ) = bytecodePatch( @@ -21,7 +20,10 @@ fun announcementsPatch( ) { block() - dependsOn(addResourcesPatch) + dependsOn( + extensionPatch, + addResourcesPatch, + ) execute { addResources("shared", "misc.announcements.announcementsPatch") diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/announcements/AnnouncementsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/announcements/AnnouncementsPatch.kt index 7b61d74c5..3bea44160 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/misc/announcements/AnnouncementsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/announcements/AnnouncementsPatch.kt @@ -2,9 +2,11 @@ package app.revanced.patches.music.misc.announcements import app.revanced.patches.all.misc.announcements.announcementsPatch import app.revanced.patches.music.shared.musicActivityOnCreateFingerprint +import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch val announcementsPatch = announcementsPatch( musicActivityOnCreateFingerprint, + sharedExtensionPatch, { compatibleWith("com.google.android.apps.music") }, diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt index 5f5aa9a8f..971adecff 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt @@ -2,6 +2,7 @@ package app.revanced.patches.youtube.misc.announcements import app.revanced.patches.all.misc.announcements.announcementsPatch import app.revanced.patches.all.misc.resources.addResources +import app.revanced.patches.music.misc.extension.sharedExtensionPatch import app.revanced.patches.shared.misc.settings.preference.SwitchPreference import app.revanced.patches.youtube.misc.settings.PreferenceScreen import app.revanced.patches.youtube.misc.settings.settingsPatch @@ -9,6 +10,7 @@ import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint val announcementsPatch = announcementsPatch( mainActivityOnCreateFingerprint, + sharedExtensionPatch, { dependsOn(settingsPatch)