diff --git a/build.gradle.kts b/build.gradle.kts index 0328d2f2..3c8847de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,7 @@ repositories { } dependencies { - implementation("app.revanced:revanced-patcher:11.0.0") + implementation("app.revanced:revanced-patcher:11.0.2") implementation("app.revanced:multidexlib2:2.5.3-a3836654") // Required for meta implementation("com.google.code.gson:gson:2.10.1") diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt index 41ff3739..a86ed1be 100644 --- a/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt @@ -14,6 +14,7 @@ import app.revanced.patches.shared.settings.preference.impl.StringResource import app.revanced.util.resources.ResourceUtils import app.revanced.util.resources.ResourceUtils.copyResources import org.w3c.dom.Node +import java.io.Closeable /** * Abstract settings resource patch @@ -24,7 +25,7 @@ import org.w3c.dom.Node abstract class AbstractSettingsResourcePatch( private val preferenceFileName: String, private val sourceDirectory: String, -) : ResourcePatch { +) : ResourcePatch, Closeable { override fun execute(context: ResourceContext): PatchResult { /* * used for self-restart diff --git a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt index 767b5c8e..18b2386b 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt @@ -29,6 +29,7 @@ import app.revanced.patches.twitch.misc.settings.fingerprints.SettingsMenuItemEn import app.revanced.patches.twitch.misc.settings.resource.patch.SettingsResourcePatch import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.immutable.ImmutableField +import java.io.Closeable @Patch @DependsOn([IntegrationsPatch::class, SettingsResourcePatch::class]) @@ -43,7 +44,7 @@ class SettingsPatch : BytecodePatch( MenuGroupsUpdatedFingerprint, MenuGroupsOnClickFingerprint ) -) { +), Closeable { override fun execute(context: BytecodeContext): PatchResult { // Hook onCreate to handle fragment creation SettingsActivityOnCreateFingerprint.result?.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt index d6fb1889..8ef75872 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt @@ -9,12 +9,13 @@ import app.revanced.patcher.patch.PatchResult import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.ResourcePatch import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControlsCompatibility +import java.io.Closeable @Name("bottom-controls-resource-patch") @Description("Manages the resources for the bottom controls of the YouTube player.") @PlayerControlsCompatibility @Version("0.0.1") -class BottomControlsResourcePatch : ResourcePatch { +class BottomControlsResourcePatch : ResourcePatch, Closeable { override fun execute(context: ResourceContext): PatchResult { resourceContext = context targetXmlEditor = context.xmlEditor[TARGET_RESOURCE] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt index 393a20e6..d304dc24 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt @@ -22,6 +22,7 @@ import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsResourc import org.jf.dexlib2.Opcode import org.jf.dexlib2.iface.instruction.OneRegisterInstruction import org.jf.dexlib2.util.MethodUtil +import java.io.Closeable @DependsOn([IntegrationsPatch::class, SettingsResourcePatch::class, ]) @Name("settings") @@ -29,7 +30,7 @@ import org.jf.dexlib2.util.MethodUtil @Version("0.0.1") class SettingsPatch : BytecodePatch( listOf(LicenseActivityFingerprint, SetThemeFingerprint) -) { +), Closeable { override fun execute(context: BytecodeContext): PatchResult { // TODO: Remove this when it is only required at one place. fun getSetThemeInstructionString(