From fab6e9fe85697bc845a8f3e0a1324ead00fc38ce Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 23 Aug 2023 15:23:55 +0200 Subject: [PATCH] refactor: remove unnecessary annotations --- .../annotations/IntegrationsCompatibility.kt | 13 ------------- .../misc/integrations/patch/IntegrationsPatch.kt | 2 -- .../annotations/IntegrationsCompatibility.kt | 8 -------- .../integrations/fingerprints/InitFingerprint.kt | 2 -- .../misc/integrations/patch/IntegrationsPatch.kt | 2 -- .../annotations/IntegrationsCompatibility.kt | 8 -------- .../misc/integrations/patch/IntegrationsPatch.kt | 10 +--------- 7 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/IntegrationsCompatibility.kt delete mode 100644 src/main/kotlin/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt delete mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt diff --git a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/IntegrationsCompatibility.kt b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/IntegrationsCompatibility.kt deleted file mode 100644 index 4ece97d66..000000000 --- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/IntegrationsCompatibility.kt +++ /dev/null @@ -1,13 +0,0 @@ -package app.revanced.patches.tiktok.misc.integrations.annotations - -import app.revanced.patcher.annotation.Compatibility -import app.revanced.patcher.annotation.Package - -@Compatibility( - [ - Package("com.ss.android.ugc.trill"), - Package("com.zhiliaoapp.musically") - ] -) -@Target(AnnotationTarget.CLASS) -internal annotation class IntegrationsCompatibility \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/IntegrationsPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/IntegrationsPatch.kt index 8d777bc69..9761c0f12 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/IntegrationsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/IntegrationsPatch.kt @@ -3,11 +3,9 @@ package app.revanced.patches.tiktok.misc.integrations.patch import app.revanced.patcher.annotation.Name import app.revanced.patcher.patch.annotations.RequiresIntegrations import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch -import app.revanced.patches.tiktok.misc.integrations.annotations.IntegrationsCompatibility import app.revanced.patches.tiktok.misc.integrations.fingerprints.InitFingerprint @Name("Integrations") -@IntegrationsCompatibility @RequiresIntegrations class IntegrationsPatch : AbstractIntegrationsPatch( "Lapp/revanced/tiktok/utils/ReVancedUtils;", diff --git a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt b/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt deleted file mode 100644 index 40778ece2..000000000 --- a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt +++ /dev/null @@ -1,8 +0,0 @@ -package app.revanced.patches.twitch.misc.integrations.annotations - -import app.revanced.patcher.annotation.Compatibility -import app.revanced.patcher.annotation.Package - -@Compatibility([Package("tv.twitch.android.app")]) -@Target(AnnotationTarget.CLASS) -internal annotation class IntegrationsCompatibility \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt b/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt index fbb3997b7..7eb3dfc2b 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt @@ -1,11 +1,9 @@ package app.revanced.patches.twitch.misc.integrations.fingerprints import app.revanced.patcher.annotation.Name -import app.revanced.patches.twitch.misc.integrations.annotations.IntegrationsCompatibility import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint @Name("Init fingerprint") -@IntegrationsCompatibility object InitFingerprint : IntegrationsFingerprint( customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("/TwitchApplication;") && diff --git a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt index 1543c3dde..21f7da9c8 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt @@ -3,11 +3,9 @@ package app.revanced.patches.twitch.misc.integrations.patch import app.revanced.patcher.annotation.Name import app.revanced.patcher.patch.annotations.RequiresIntegrations import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch -import app.revanced.patches.twitch.misc.integrations.annotations.IntegrationsCompatibility import app.revanced.patches.twitch.misc.integrations.fingerprints.InitFingerprint @Name("Integrations") -@IntegrationsCompatibility @RequiresIntegrations class IntegrationsPatch : AbstractIntegrationsPatch( "Lapp/revanced/twitch/utils/ReVancedUtils;", diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt deleted file mode 100644 index 3ce5ea428..000000000 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt +++ /dev/null @@ -1,8 +0,0 @@ -package app.revanced.patches.youtube.misc.integrations.annotations - -import app.revanced.patcher.annotation.Compatibility -import app.revanced.patcher.annotation.Package - -@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35", "18.29.38"))]) -@Target(AnnotationTarget.CLASS) -internal annotation class IntegrationsCompatibility \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt index e3b5a031c..492264e90 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt @@ -3,17 +3,9 @@ package app.revanced.patches.youtube.misc.integrations.patch import app.revanced.patcher.annotation.Name import app.revanced.patcher.patch.annotations.RequiresIntegrations import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch -import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility -import app.revanced.patches.youtube.misc.integrations.fingerprints.EmbeddedPlayerControlsOverlayFingerprint -import app.revanced.patches.youtube.misc.integrations.fingerprints.EmbeddedPlayerFingerprint -import app.revanced.patches.youtube.misc.integrations.fingerprints.ApplicationInitFingerprint -import app.revanced.patches.youtube.misc.integrations.fingerprints.RemoteEmbedFragmentFingerprint -import app.revanced.patches.youtube.misc.integrations.fingerprints.RemoteEmbeddedPlayerFingerprint -import app.revanced.patches.youtube.misc.integrations.fingerprints.APIPlayerServiceFingerprint -import app.revanced.patches.youtube.misc.integrations.fingerprints.StandalonePlayerActivityFingerprint +import app.revanced.patches.youtube.misc.integrations.fingerprints.* @Name("Integrations") -@IntegrationsCompatibility @RequiresIntegrations class IntegrationsPatch : AbstractIntegrationsPatch( "Lapp/revanced/integrations/utils/ReVancedUtils;",