From e678115b242eed4b6736808102439c8731ebd81f Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 31 Aug 2022 20:37:21 +0200 Subject: [PATCH] refactor: make use of named arguments --- .../fingerprints/CodecsLockFingerprint.kt | 6 ++-- .../CastContextFetchFingerprint.kt | 5 ++- .../CastDynamiteModuleFingerprint.kt | 5 ++- .../CastDynamiteModuleV2Fingerprint.kt | 5 ++- .../GooglePlayUtilityFingerprint.kt | 13 ++++++-- .../microg/fingerprints/PrimeFingerprint.kt | 4 +-- .../fingerprints/ServiceCheckFingerprint.kt | 7 +++-- .../annotations/GeneralAdsCompatibility.kt | 6 +--- .../annotations/PremiumIconCompatibility.kt | 6 +--- .../fingerprints/PremiumIconFingerprint.kt | 8 ++--- .../ad/annotations/TiktokAdsCompatibility.kt | 4 +-- .../FeedItemListCloneFingerprint.kt | 2 +- .../annotations/DownloadsCompatibility.kt | 4 +-- .../fingerprints/ACLCommonShareFingerprint.kt | 5 +-- .../ACLCommonShareFingerprint2.kt | 5 +-- .../ACLCommonShareFingerprint3.kt | 5 +-- .../annotations/SeekbarCompatibility.kt | 4 +-- .../AwemeGetVideoControlFingerprint.kt | 9 ++---- .../annotations/TimelineAdsCompatibility.kt | 6 +--- .../TimelineTweetJsonParserFingerprint.kt | 6 ++-- .../FirebaseGetCertPatchCompatibility.kt | 6 +--- .../GetCertMessagingFingerprint.kt | 5 +-- .../GetCertRegistrationFingerprint.kt | 5 +-- .../PromoCodeUnlockCompatibility.kt | 6 +--- .../PromoCodeUnlockFingerprint.kt | 9 ++---- .../HideInfocardSuggestionsFingerprint.kt | 5 +-- ...ideInfocardSuggestionsParentFingerprint.kt | 7 ++--- .../fingerprints/ShowVideoAdsFingerprint.kt | 2 +- .../SwipeControlsHostActivityFingerprint.kt | 2 +- .../WatchWhileActivityFingerprint.kt | 2 +- .../resource/SwipeControlsResourcePatch.kt | 2 -- .../amoled/annotations/AmoledCompatibility.kt | 6 +--- .../AutoNavInformerFingerprint.kt | 7 ++--- .../LayoutConstructorFingerprint.kt | 4 +-- .../PremiumHeadingCompatibility.kt | 6 +--- .../CustomBrandingCompatibility.kt | 6 +--- .../annotations/CastPatchCompatibility.kt | 6 +--- .../FullscreenViewAdderFingerprint.kt | 5 +-- .../FullscreenViewAdderParentFingerprint.kt | 9 ++---- .../fingerprints/HideReelsFingerprint.kt | 6 ++-- .../fingerprints/DislikeFingerprint.kt | 4 +-- .../fingerprints/LikeFingerprint.kt | 4 +-- .../fingerprints/RemoveLikeFingerprint.kt | 4 +-- .../TextComponentSpecParentFingerprint.kt | 6 +--- .../CreateVideoPlayerSeekbarFingerprint.kt | 5 ++- .../NextGenWatchLayoutFingerprint.kt | 3 -- ...erControllerSetTimeReferenceFingerprint.kt | 5 ++- .../fingerprints/PlayerInitFingerprint.kt | 2 -- .../PlayerOverlaysLayoutInitFingerprint.kt | 6 ++-- .../RectangleFieldInvalidatorFingerprint.kt | 6 +--- .../bytecode/fingerprints/SeekFingerprint.kt | 6 +--- .../fingerprints/VideoLengthFingerprint.kt | 3 +- .../fingerprints/VideoTimeFingerprint.kt | 3 +- .../MiniPlayerOverrideFingerprint.kt | 4 +-- .../MiniPlayerOverrideNoContextFingerprint.kt | 4 +-- ...PlayerResponseModelSizeCheckFingerprint.kt | 3 +- .../fingerprints/HideWatermarkFingerprint.kt | 2 +- .../HideWatermarkParentFingerprint.kt | 2 +- .../WideSearchbarOneFingerprint.kt | 29 ++--------------- .../WideSearchbarOneParentFingerprint.kt | 31 ++----------------- .../WideSearchbarTwoFingerprint.kt | 29 ++--------------- .../WideSearchbarTwoParentFingerprint.kt | 16 ++-------- .../fingerprints/AutoRepeatFingerprint.kt | 2 -- .../AutoRepeatParentFingerprint.kt | 19 +++--------- .../annotations/ClientSpoofCompatibility.kt | 4 +-- .../UserAgentHeaderBuilderFingerprint.kt | 8 ++--- .../clientspoof/patch/ClientSpoofPatch.kt | 1 - .../SpeedArrayGeneratorFingerprint.kt | 7 ++--- .../EnableDebuggingCompatibility.kt | 6 +--- .../HDRBrightnessFingerprintYEL.kt | 1 - .../HDRBrightnessFingerprintYJK.kt | 6 ++-- .../fingerprints/InitFingerprint.kt | 5 ++- .../FixLocaleConfigErrorCompatibility.kt | 6 +--- .../CastContextFetchFingerprint.kt | 5 ++- .../CastDynamiteModuleFingerprint.kt | 5 ++- .../CastDynamiteModuleV2Fingerprint.kt | 5 ++- .../GooglePlayUtilityFingerprint.kt | 5 ++- .../fingerprints/IntegrityCheckFingerprint.kt | 3 +- .../microg/fingerprints/PrimeFingerprint.kt | 4 +-- .../fingerprints/ServiceCheckFingerprint.kt | 4 +-- .../MinimizedPlaybackKidsFingerprint.kt | 3 +- .../MinimizedPlaybackSettingsFingerprint.kt | 3 +- .../BottomControlsInflateFingerprint.kt | 6 ++-- .../PlayerControlsVisibilityFingerprint.kt | 4 ++- ...layerOverlaysOnFinishInflateFingerprint.kt | 2 +- .../UpdatePlayerTypeFingerprint.kt | 3 +- .../annotations/SettingsCompatibility.kt | 6 +--- .../LicenseActivityFingerprint.kt | 7 +---- .../ReVancedSettingsActivityFingerprint.kt | 7 +---- .../fingerprints/ThemeSetterFingerprint.kt | 7 ++--- .../fingerprints/MaxBufferFingerprint.kt | 5 ++- .../fingerprints/PlaybackBufferFingerprint.kt | 3 +- .../fingerprints/ReBufferFingerprint.kt | 3 +- 93 files changed, 160 insertions(+), 393 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt index 7ef1a0f68..10a3f65b1 100644 --- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt @@ -3,9 +3,9 @@ package app.revanced.patches.music.audio.codecs.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode @@ -19,7 +19,7 @@ import org.jf.dexlib2.Opcode @CodecsUnlockCompatibility @Version("0.0.1") object CodecsLockFingerprint : MethodFingerprint( - "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, listOf( + "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf( Opcode.INVOKE_DIRECT, Opcode.INVOKE_VIRTUAL, Opcode.MOVE_RESULT, @@ -35,5 +35,5 @@ object CodecsLockFingerprint : MethodFingerprint( Opcode.INVOKE_DIRECT, Opcode.RETURN_OBJECT ), - listOf("eac3_supported") + strings = listOf("eac3_supported") ) diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt index 08e1b035b..7ef6fba14 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt @@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility @Name("cast-context-fetch-fingerprint") @@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi @MicroGPatchCompatibility @Version("0.0.1") object CastContextFetchFingerprint : MethodFingerprint( - null, null, null, null, - listOf("Error fetching CastContext.") + strings = listOf("Error fetching CastContext.") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt index 5d6665613..3e262188e 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt @@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility @Name("cast-module-fingerprint") @@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi @MicroGPatchCompatibility @Version("0.0.1") object CastDynamiteModuleFingerprint : MethodFingerprint( - null, null, null, null, - listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl") + strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt index 6f06be207..4c117108f 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt @@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility @Name("cast-context-fetch-fingerprint") @@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi @MicroGPatchCompatibility @Version("0.0.1") object CastDynamiteModuleV2Fingerprint : MethodFingerprint( - null, null, null, null, - listOf("Failed to load module via V2: ") + strings = listOf("Failed to load module via V2: ") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt index c39c436e3..d12b0bf9b 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt @@ -3,9 +3,9 @@ package app.revanced.patches.music.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility import org.jf.dexlib2.AccessFlags @@ -17,5 +17,14 @@ import org.jf.dexlib2.AccessFlags @MusicMicroGPatchCompatibility @Version("0.0.1") object GooglePlayUtilityFingerprint : MethodFingerprint( - "I", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("This should never happen.", "MetadataValueReader", "GooglePlayServicesUtil", "com.android.vending", "android.hardware.type.embedded") + "I", + AccessFlags.PUBLIC or AccessFlags.STATIC, + listOf("L", "I"), + strings = listOf( + "This should never happen.", + "MetadataValueReader", + "GooglePlayServicesUtil", + "com.android.vending", + "android.hardware.type.embedded" + ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt index 550b1d836..65ec90479 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt @@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility @Name("google-play-prime-fingerprint") @@ -15,5 +15,5 @@ import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompat @MusicMicroGPatchCompatibility @Version("0.0.1") object PrimeFingerprint : MethodFingerprint( - null, null, null, null, listOf("com.google.android.GoogleCamera", "com.android.vending") + strings = listOf("com.google.android.GoogleCamera", "com.android.vending") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt index c4d65a7c4..2e9091373 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt @@ -3,9 +3,9 @@ package app.revanced.patches.music.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility import org.jf.dexlib2.AccessFlags @@ -17,5 +17,8 @@ import org.jf.dexlib2.AccessFlags @MusicMicroGPatchCompatibility @Version("0.0.1") object ServiceCheckFingerprint : MethodFingerprint( - "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("Google Play Services not available") + "V", + AccessFlags.PUBLIC or AccessFlags.STATIC, + listOf("L", "I"), + strings = listOf("Google Play Services not available") ) diff --git a/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt b/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt index 7b973c3b7..0666c8769 100644 --- a/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.reddit.ad.general.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.reddit.frontpage", arrayOf() - )] -) +@Compatibility([Package("com.reddit.frontpage")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class GeneralAdsCompatibility diff --git a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt index 97fe282a1..11ea3c868 100644 --- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.reddit.layout.premiumicon.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.reddit.frontpage", arrayOf() - )] -) +@Compatibility([Package("com.reddit.frontpage")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class PremiumIconCompatibility diff --git a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt index 83273a61f..db36dceca 100644 --- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt @@ -2,8 +2,8 @@ package app.revanced.patches.reddit.layout.premiumicon.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility @Name("premium-icon-fingerprint") @@ -14,11 +14,7 @@ import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCom @Version("0.0.1") object PremiumIconFingerprint : MethodFingerprint( "Z", - null, - null, - null, - null, - { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("MyAccount;") && methodDef.name == "isPremiumSubscriber" } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt b/src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt index 0a1f92c65..f9a1089d2 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt @@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package @Compatibility( [ - Package("com.ss.android.ugc.trill", arrayOf()), - Package("com.zhiliaoapp.musically", arrayOf()) + Package("com.ss.android.ugc.trill"), + Package("com.zhiliaoapp.musically") ] ) @Target(AnnotationTarget.CLASS) diff --git a/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt b/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt index d7864768d..875277f9a 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt @@ -14,7 +14,7 @@ import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility @TiktokAdsCompatibility @Version("0.0.1") object FeedItemListCloneFingerprint : MethodFingerprint( - null, null, null, null,null, { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("/FeedItemList;") && methodDef.name == "clone" } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt index 170239e7e..2a353e839 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt @@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package @Compatibility( [ - Package("com.ss.android.ugc.trill", arrayOf()), - Package("com.zhiliaoapp.musically", arrayOf()) + Package("com.ss.android.ugc.trill"), + Package("com.zhiliaoapp.musically") ] ) @Target(AnnotationTarget.CLASS) diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt index 991702cd1..8fcc3ad78 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt @@ -15,10 +15,7 @@ import org.jf.dexlib2.AccessFlags object ACLCommonShareFingerprint : MethodFingerprint( "I", AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - null, - null, - { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("/ACLCommonShare;") && methodDef.name == "getCode" } diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt index 62284e395..33bb8a8b3 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt @@ -15,10 +15,7 @@ import org.jf.dexlib2.AccessFlags object ACLCommonShareFingerprint2 : MethodFingerprint( "I", AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - null, - null, - { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("/ACLCommonShare;") && methodDef.name == "getShowType" } diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt index 9e1c49635..59120277d 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt @@ -15,10 +15,7 @@ import org.jf.dexlib2.AccessFlags object ACLCommonShareFingerprint3 : MethodFingerprint( "I", AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - null, - null, - { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("/ACLCommonShare;") && methodDef.name == "getTranscode" } diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt index 7c7983c46..889f1f880 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt @@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package @Compatibility( [ - Package("com.ss.android.ugc.trill", arrayOf()), - Package("com.zhiliaoapp.musically", arrayOf()) + Package("com.ss.android.ugc.trill"), + Package("com.zhiliaoapp.musically") ] ) @Target(AnnotationTarget.CLASS) diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt index 0ac485d28..a52db973c 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt @@ -14,10 +14,7 @@ import org.jf.dexlib2.AccessFlags object AwemeGetVideoControlFingerprint : MethodFingerprint( "L", AccessFlags.PUBLIC.value, - null, - null, - null, - { methodDef -> - methodDef.definingClass.endsWith("/Aweme;") && methodDef.name == "getVideoControl" - } + customFingerprint = { methodDef -> + methodDef.definingClass.endsWith("/Aweme;") && methodDef.name == "getVideoControl" + } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt index 65831eb76..54ce87619 100644 --- a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.twitter.ad.timeline.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.twitter.android", arrayOf() - )] -) +@Compatibility([Package("com.twitter.android")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class TimelineAdsCompatibility \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt index 9c7aafa37..3894aa5aa 100644 --- a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt @@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode @TimelineAdsCompatibility @Version("0.0.1") object TimelineTweetJsonParserFingerprint : MethodFingerprint( - null, null, null, listOf( + opcodes = listOf( Opcode.IPUT_OBJECT, Opcode.GOTO, Opcode.SGET_OBJECT, @@ -21,6 +21,6 @@ object TimelineTweetJsonParserFingerprint : MethodFingerprint( Opcode.CHECK_CAST, Opcode.IPUT_OBJECT, Opcode.RETURN_VOID, - ), listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"), - { methodDef -> methodDef.name == "parseField" } + ), strings = listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"), + customFingerprint = { methodDef -> methodDef.name == "parseField" } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt index bd6e1bfca..a87fa5336 100644 --- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.warnwetter.misc.firebasegetcert.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "de.dwd.warnapp", arrayOf() - )] -) +@Compatibility([Package("de.dwd.warnapp")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class FirebaseGetCertPatchCompatibility \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt index 1318fee29..6f94634c0 100644 --- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt @@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase @Version("0.0.1") object GetMessagingCertFingerprint : MethodFingerprint( "Ljava/lang/String;", - null, - null, - null, - listOf( + strings = listOf( "ContentValues", "Could not get fingerprint hash for package: ", "No such package: " diff --git a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt index 2dd2036ed..8a19a2338 100644 --- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt @@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase @Version("0.0.1") object GetReqistrationCertFingerprint : MethodFingerprint( "Ljava/lang/String;", - null, - null, - null, - listOf( + strings = listOf( "FirebaseRemoteConfig", "Could not get fingerprint hash for package: ", "No such package: " diff --git a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt index b14201ecd..f4c2cc150 100644 --- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.warnwetter.misc.promocode.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "de.dwd.warnapp", arrayOf() - )] -) +@Compatibility([Package("de.dwd.warnapp")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class PromoCodeUnlockCompatibility diff --git a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt index c32001e88..bf1158403 100644 --- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt @@ -2,8 +2,8 @@ package app.revanced.patches.warnwetter.misc.promocode.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility @Name("promo-code-unlock-fingerprint") @@ -13,12 +13,7 @@ import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnloc @PromoCodeUnlockCompatibility @Version("0.0.1") object PromoCodeUnlockFingerprint : MethodFingerprint( - null, - null, - null, - null, - null, - { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid" } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt index 124006395..a6e9bc3e9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt @@ -17,8 +17,5 @@ import org.jf.dexlib2.AccessFlags object HideInfocardSuggestionsFingerprint : MethodFingerprint( "Ljava/lang/Boolean;", AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - null, - listOf("vibrator"), - null + strings = listOf("vibrator") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt index 6c68dd13b..4964f90ae 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt @@ -3,9 +3,9 @@ package app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility import org.jf.dexlib2.AccessFlags @@ -17,8 +17,5 @@ import org.jf.dexlib2.AccessFlags object HideInfocardSuggestionsParentFingerprint : MethodFingerprint( "Ljava/lang/String;", AccessFlags.PUBLIC or AccessFlags.FINAL, - listOf(), - null, - listOf("player_overlay_info_card_teaser"), - null + strings = listOf("player_overlay_info_card_teaser"), ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt index 52dee1c9b..4219e8f81 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt @@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags @VideoAdsCompatibility @Version("0.0.1") object ShowVideoAdsFingerprint : MethodFingerprint( - "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null + "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt index 3d59e0f4e..014977fc2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt @@ -15,7 +15,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo @SwipeControlsCompatibility @Version("0.0.1") object SwipeControlsHostActivityFingerprint : MethodFingerprint( - null, null, null, null, null, { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;" && methodDef.name == "" } ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt index af8499189..7704951b2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt @@ -15,7 +15,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo @SwipeControlsCompatibility @Version("0.0.1") object WatchWhileActivityFingerprint : MethodFingerprint( - null, null, null, null, null, { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("WatchWhileActivity;") && methodDef.name == "" } ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt index 84f8fb4e3..7db15e2ce 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt @@ -92,8 +92,6 @@ class SwipeControlsResourcePatch : ResourcePatch() { ) ) - val resourcesDir = "swipecontrols" - data.copyResources( "swipecontrols", ResourceUtils.ResourceGroup( diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt index 53e2956b2..50f383f46 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.amoled.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.google.android.youtube", arrayOf() - )] -) +@Compatibility([Package("com.google.android.youtube")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class AmoledCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt index 1eadc9a59..3191a00bd 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt @@ -3,7 +3,6 @@ package app.revanced.patches.youtube.layout.autoplaybutton.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility @@ -19,8 +18,7 @@ import org.jf.dexlib2.Opcode object AutoNavInformerFingerprint : MethodFingerprint( "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - listOf( + opcodes = listOf( Opcode.IGET_OBJECT, Opcode.INVOKE_INTERFACE, Opcode.MOVE_RESULT_OBJECT, @@ -28,6 +26,5 @@ object AutoNavInformerFingerprint : MethodFingerprint( Opcode.INVOKE_VIRTUAL, Opcode.MOVE_RESULT, ), - null, - { it.definingClass.endsWith("WillAutonavInformer;") } + customFingerprint = { it.definingClass.endsWith("WillAutonavInformer;") } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt index b4959dee9..ab1797cb4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt @@ -13,8 +13,8 @@ import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayBu @AutoplayButtonCompatibility @Version("0.0.1") object LayoutConstructorFingerprint : MethodFingerprint( - null, null, null, null, listOf("1.0x"), - { methodDef -> + strings = listOf("1.0x"), + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("YouTubeControlsOverlay;") } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt index 188658da7..96b1d5078 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.header.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.google.android.youtube", arrayOf() - )] -) +@Compatibility([Package("com.google.android.youtube")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class PremiumHeadingCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt index 7c276f0a9..a0ffc713b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.icon.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.google.android.youtube", arrayOf() - )] -) +@Compatibility([Package("com.google.android.youtube")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class CustomBrandingCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt index 2ed7cc14c..6b3f0229e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.castbutton.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.google.android.youtube", arrayOf() - )] -) +@Compatibility([Package("com.google.android.youtube")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class CastButtonCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt index f11b7780e..0e714c1f1 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt @@ -16,10 +16,7 @@ import org.jf.dexlib2.Opcode @ShortsButtonCompatibility @Version("0.0.1") object FullscreenViewAdderFingerprint : MethodFingerprint( - null, - null, - null, - listOf( + opcodes = listOf( Opcode.IGET_BOOLEAN ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt index 9073b25e5..fc3126d5d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt @@ -16,10 +16,8 @@ import org.jf.dexlib2.Opcode @ShortsButtonCompatibility @Version("0.0.1") object FullscreenViewAdderParentFingerprint : MethodFingerprint( - null, - null, - listOf("L", "L"), - listOf( + parameters = listOf("L", "L"), + opcodes = listOf( Opcode.GOTO, Opcode.IGET_BOOLEAN, Opcode.IF_EQ, @@ -27,6 +25,5 @@ object FullscreenViewAdderParentFingerprint : MethodFingerprint( Opcode.CONST_4, Opcode.INVOKE_VIRTUAL, ), - null, - { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") } + customFingerprint = { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") } ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/reels/fingerprints/HideReelsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/reels/fingerprints/HideReelsFingerprint.kt index 90986665b..fc6ab8a21 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/reels/fingerprints/HideReelsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/reels/fingerprints/HideReelsFingerprint.kt @@ -3,9 +3,9 @@ package app.revanced.patches.youtube.layout.reels.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility import org.jf.dexlib2.AccessFlags @@ -17,6 +17,6 @@ import org.jf.dexlib2.AccessFlags @HideReelsCompatibility @Version("0.0.1") object HideReelsFingerprint : MethodFingerprint( - null, AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("L", "L"), null, - listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo") + access = AccessFlags.PROTECTED or AccessFlags.FINAL, parameters = listOf("L", "L"), + strings = listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt index d8faed3b5..0f5038579 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt @@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags object DislikeFingerprint : MethodFingerprint( "V", AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, - null, - null, - listOf("like/dislike") + strings = listOf("like/dislike") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt index ec1cebe12..fcca8f428 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt @@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags object LikeFingerprint : MethodFingerprint( "V", AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, - null, - null, - listOf("like/like") + strings = listOf("like/like") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt index 4561de2b0..ce98f1cb5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt @@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags object RemoveLikeFingerprint : MethodFingerprint( "V", AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, - null, - null, - listOf("like/removelike") + strings = listOf("like/removelike") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentSpecParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentSpecParentFingerprint.kt index fdc689ba0..40030d049 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentSpecParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentSpecParentFingerprint.kt @@ -15,9 +15,5 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.Retu @ReturnYouTubeDislikeCompatibility @Version("0.0.1") object TextComponentSpecParentFingerprint : MethodFingerprint( - null, - null, - null, - null, - listOf("TextComponentSpec: No converter for extension: ") + strings = listOf("TextComponentSpec: No converter for extension: ") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt index eafd1e674..28ab1a8d6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt @@ -15,7 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock @SponsorBlockCompatibility @Version("0.0.1") object CreateVideoPlayerSeekbarFingerprint : MethodFingerprint( - "V", null, null, - null, - listOf("timed_markers_width") + "V", + strings = listOf("timed_markers_width") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/NextGenWatchLayoutFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/NextGenWatchLayoutFingerprint.kt index 013d21025..84cb58d2f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/NextGenWatchLayoutFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/NextGenWatchLayoutFingerprint.kt @@ -17,8 +17,5 @@ import org.jf.dexlib2.util.MethodUtil @Version("0.0.1") object NextGenWatchLayoutFingerprint : MethodFingerprint( "V", // constructors return void, in favour of speed of matching, this fingerprint has been added - null, - null, - null, customFingerprint = { methodDef -> MethodUtil.isConstructor(methodDef) && methodDef.parameterTypes.size == 3 && methodDef.definingClass.endsWith("NextGenWatchLayout;") } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt index 9b4127782..8b3a11a1a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt @@ -16,7 +16,6 @@ import org.jf.dexlib2.Opcode @SponsorBlockCompatibility @Version("0.0.1") object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint( - null, null, null, - listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT), - listOf("Media progress reported outside media playback: ") + opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT), + strings = listOf("Media progress reported outside media playback: ") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerInitFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerInitFingerprint.kt index edd04188d..c775dc9c3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerInitFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerInitFingerprint.kt @@ -15,8 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock @SponsorBlockCompatibility @Version("0.0.1") object PlayerInitFingerprint : MethodFingerprint( - null, null, null, - null, strings = listOf( "playVideo called on player response with no videoStreamingData." ), diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerOverlaysLayoutInitFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerOverlaysLayoutInitFingerprint.kt index 375480287..255f48a97 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerOverlaysLayoutInitFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerOverlaysLayoutInitFingerprint.kt @@ -15,8 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock @SponsorBlockCompatibility @Version("0.0.1") object PlayerOverlaysLayoutInitFingerprint : MethodFingerprint( - null, null, null, - null, - null, - { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") } + + customFingerprint = { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt index e7425a95d..ccfa4b76f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt @@ -18,11 +18,7 @@ import org.jf.dexlib2.iface.reference.MethodReference @Version("0.0.1") object RectangleFieldInvalidatorFingerprint : MethodFingerprint( "V", - null, - null, - null, - null, - custom@{ methodDef -> + customFingerprint = custom@{ methodDef -> val instructions = methodDef.implementation?.instructions!! val instructionCount = instructions.count() diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/SeekFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/SeekFingerprint.kt index 855bbe042..3029a26f5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/SeekFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/SeekFingerprint.kt @@ -15,9 +15,5 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock @SponsorBlockCompatibility @Version("0.0.1") object SeekFingerprint : MethodFingerprint( - null, - null, - null, - null, - listOf("Attempting to seek during an ad") + strings = listOf("Attempting to seek during an ad") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoLengthFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoLengthFingerprint.kt index 38085c210..91c243d02 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoLengthFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoLengthFingerprint.kt @@ -16,8 +16,7 @@ import org.jf.dexlib2.Opcode @SponsorBlockCompatibility @Version("0.0.1") object VideoLengthFingerprint : MethodFingerprint( - null, null, null, - listOf( + opcodes = listOf( Opcode.MOVE_RESULT_WIDE, Opcode.CMP_LONG, Opcode.IF_LEZ, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoTimeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoTimeFingerprint.kt index 32f59cc03..8183ce670 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoTimeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoTimeFingerprint.kt @@ -15,6 +15,5 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock @SponsorBlockCompatibility @Version("0.0.1") object VideoTimeFingerprint : MethodFingerprint( - null, null, null, null, - listOf("MedialibPlayerTimeInfo{currentPositionMillis=") + strings = listOf("MedialibPlayerTimeInfo{currentPositionMillis=") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt index 859783d81..2077eda26 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt @@ -16,6 +16,6 @@ import org.jf.dexlib2.Opcode @TabletMiniPlayerCompatibility @Version("0.0.1") object MiniPlayerOverrideFingerprint : MethodFingerprint( - "Z", AccessFlags.STATIC or AccessFlags.PUBLIC ,null, - listOf(Opcode.RETURN), // anchor to insert the instruction + "Z", AccessFlags.STATIC or AccessFlags.PUBLIC, + opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt index 5e4c96050..ef89570a8 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt @@ -16,6 +16,6 @@ import org.jf.dexlib2.Opcode @TabletMiniPlayerCompatibility @Version("0.0.1") object MiniPlayerOverrideNoContextFingerprint : MethodFingerprint( - "Z", AccessFlags.FINAL or AccessFlags.PRIVATE ,null, - listOf(Opcode.RETURN), // anchor to insert the instruction + "Z", AccessFlags.FINAL or AccessFlags.PRIVATE, + opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt index f36608934..7e6cd45a5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt @@ -32,6 +32,5 @@ object MiniPlayerResponseModelSizeCheckFingerprint : MethodFingerprint( Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT, Opcode.IF_NEZ, - ), - null + ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkFingerprint.kt index 2591a37ea..2360866c1 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkFingerprint.kt @@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags @HideWatermarkCompatibility @Version("0.0.1") object HideWatermarkFingerprint : MethodFingerprint ( - "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), null ,null, null + "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkParentFingerprint.kt index 036a315d1..16660b557 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkParentFingerprint.kt @@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags @HideWatermarkCompatibility @Version("0.0.1") object HideWatermarkParentFingerprint : MethodFingerprint ( - "L", AccessFlags.PUBLIC or AccessFlags.FINAL, null, null, listOf("player_overlay_in_video_programming"), null + "L", AccessFlags.PUBLIC or AccessFlags.FINAL, strings = listOf("player_overlay_in_video_programming") ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneFingerprint.kt index 42077c410..2826060fa 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneFingerprint.kt @@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint -import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode @@ -18,31 +17,7 @@ import org.jf.dexlib2.Opcode @DirectPatternScanMethod @WideSearchbarCompatibility @Version("0.0.1") - -/* -This finds the following method: -public final View i(akrl akrlVar, adpd adpdVar) { -} - -Method we search for is located in smali now. -See: -.method public final i(Lakrl;Ladpd;)Landroid/view/View; - iget-object v0, p0, Ljkg;->a:Landroid/app/Activity; - invoke-static {v0}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; - move-result-object v0 - iget-object v1, p0, Ljkg;->g:Ljis; - const/4 v2, 0x0 - invoke-interface {v1, v2}, Ljis;->h(Z)V - iget-object p1, p1, Lakrl;->f:Lahnq; - if-nez p1, :cond_12 - sget-object p1, Lahnq;->a:Lahnq; - :cond_12 - iget-object v1, p0, Ljkg;->x:Ltxm; - invoke-static {v1}, Lfbn;->aF(Ltxm;)Z //THIS IS WHAT WE SEARCH FOR (Method fbn.aF) - move-result v1 - */ - object WideSearchbarOneFingerprint : MethodFingerprint( - "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), listOf(Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_STATIC), - null, null + "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), + listOf(Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_STATIC) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneParentFingerprint.kt index 3d4810f09..b3183a845 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneParentFingerprint.kt @@ -3,10 +3,9 @@ package app.revanced.patches.youtube.layout.widesearchbar.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod -import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility import org.jf.dexlib2.AccessFlags @@ -17,31 +16,7 @@ import org.jf.dexlib2.AccessFlags @FuzzyPatternScanMethod(3) @WideSearchbarCompatibility @Version("0.0.1") - -/* - * This finds the following method: - private final void l(PaneDescriptor paneDescriptor) { - Class cls = null; - ahat f = paneDescriptor != null ? paneDescriptor.f() : null; - if (paneDescriptor != null) { - cls = paneDescriptor.a; - } - ftu k = k(); - if ((k == null || !k.bk()) && ((!frx.k(f) && !((Boolean) aqer.S(this.n).X(new fac(this, f, 19)).K(irx.i).aH(false)).booleanValue()) || (f != null && f.qA(ReelWatchEndpointOuterClass$ReelWatchEndpoint.reelWatchEndpoint)))) { - String j = frx.j(f); - if ((j != null && ("FEhistory".equals(j) || "FEmy_videos".equals(j) || "FEpurchases".equals(j) || j.startsWith("VL"))) || cls == this.I.E() || cls == this.G.a) { - this.F = 3; - return; - } else { - this.F = 2; - return; - } - } - this.F = 1; - } - */ - object WideSearchbarOneParentFingerprint : MethodFingerprint( - "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"), null, - listOf("FEhistory", "FEmy_videos", "FEpurchases") + "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"), + strings = listOf("FEhistory", "FEmy_videos", "FEpurchases") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoFingerprint.kt index fcae865d3..31c94a84a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoFingerprint.kt @@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint -import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode @@ -18,32 +17,8 @@ import org.jf.dexlib2.Opcode @DirectPatternScanMethod @WideSearchbarCompatibility @Version("0.0.1") - -/* -public static jis h(Context context, txm txmVar, uag uagVar, txp txpVar) { - return fbn.aB(txmVar) ? new jhx(context, txmVar, uagVar, txpVar) : jis.d; - } - -Method we search for is located in smali now. -See: -.method public static h(Landroid/content/Context;Ltxm;Luag;Ltxp;)Ljis; - invoke-static {p1}, Lfbn;->aB(Ltxm;)Z //this is the method we want to change. fbn.aB - move-result v0 - if-eqz v0, :cond_c - new-instance v0, Ljhx; - invoke-direct {v0, p0, p1, p2, p3}, Ljhx;->(Landroid/content/Context;Ltxm;Luag;Ltxp;)V - goto :goto_e - :cond_c - sget-object v0, Ljis;->d:Ljis; - :goto_e - return-object v0 -.end method - - */ - object WideSearchbarTwoFingerprint : MethodFingerprint( - "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, listOf( + "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf( Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT, Opcode.IF_EQZ, Opcode.NEW_INSTANCE - ), - null, null + ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt index 67af9a034..4c33d7086 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt @@ -14,19 +14,7 @@ import org.jf.dexlib2.AccessFlags ) @WideSearchbarCompatibility @Version("0.0.1") - -/* -This finds following method: -public static ies i(br brVar) { - bp f = brVar.getSupportFragmentManager().f("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT"); - if (f != null) { - return (kga) f; - } - return new kga(); - } - */ - object WideSearchbarTwoParentFingerprint : MethodFingerprint( - "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), null, - listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT") + "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), + strings = listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt index c5a65f4e8..da3340f51 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt @@ -26,7 +26,5 @@ object AutoRepeatFingerprint : MethodFingerprint( "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), - null, - null, customFingerprint = { methodDef -> methodDef.implementation!!.instructions.count() == 3 && methodDef.annotations.isEmpty()} ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt index a4d0c02f4..461eb7c2a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt @@ -3,9 +3,9 @@ package app.revanced.patches.youtube.misc.autorepeat.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.autorepeat.annotations.AutoRepeatCompatibility import org.jf.dexlib2.AccessFlags @@ -16,20 +16,11 @@ import org.jf.dexlib2.AccessFlags @FuzzyPatternScanMethod(2) @AutoRepeatCompatibility @Version("0.0.1") -//This Fingerprints finds the play() method needed to be called when AutoRepeatPatch.shouldAutoRepeat() == true -/* -public final void E() { -Stuff happens -String str = "play() called when the player wasn't loaded."; -String str2 = "play() blocked because Background Playability failed"; -Stuff happens again -} - */ object AutoRepeatParentFingerprint : MethodFingerprint( "V", AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - null, - listOf("play() called when the player wasn't loaded.", "play() blocked because Background Playability failed"), - null + strings = listOf( + "play() called when the player wasn't loaded.", + "play() blocked because Background Playability failed" + ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/annotations/ClientSpoofCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/annotations/ClientSpoofCompatibility.kt index 8ed28dbdf..96a7b5cda 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/annotations/ClientSpoofCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/annotations/ClientSpoofCompatibility.kt @@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package @Compatibility( [ - Package("com.google.android.youtube", arrayOf()), - Package("com.vanced.android.youtube", arrayOf()) + Package("com.google.android.youtube"), + Package("com.vanced.android.youtube") ] ) @Target(AnnotationTarget.CLASS) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt index aebc83503..bf216b350 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt @@ -12,9 +12,7 @@ import org.jf.dexlib2.Opcode @DirectPatternScanMethod @Version("0.0.1") object UserAgentHeaderBuilderFingerprint : MethodFingerprint( - null, - null, - listOf("L", "L", "L"), - listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL), - listOf("(Linux; U; Android "), + parameters = listOf("L", "L", "L"), + opcodes = listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL), + strings = listOf("(Linux; U; Android "), ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt index ea9ef6c54..f9ad8f42b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt @@ -12,7 +12,6 @@ import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.patch.impl.BytecodePatch import app.revanced.patches.youtube.misc.clientspoof.annotations.ClientSpoofCompatibility import app.revanced.patches.youtube.misc.clientspoof.fingerprints.UserAgentHeaderBuilderFingerprint -import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction @Patch diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedArrayGeneratorFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedArrayGeneratorFingerprint.kt index 9d16c87bf..cb8e23ac7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedArrayGeneratorFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedArrayGeneratorFingerprint.kt @@ -3,9 +3,9 @@ package app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode @@ -20,8 +20,7 @@ import org.jf.dexlib2.Opcode object SpeedArrayGeneratorFingerprint : MethodFingerprint( "[L", AccessFlags.PUBLIC or AccessFlags.STATIC, - null, - listOf( + opcodes = listOf( Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.GOTO, @@ -29,5 +28,5 @@ object SpeedArrayGeneratorFingerprint : MethodFingerprint( Opcode.MOVE_RESULT_OBJECT, Opcode.IGET_OBJECT, ), - listOf("0.0#") + strings = listOf("0.0#") ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/annotations/EnableDebuggingCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/annotations/EnableDebuggingCompatibility.kt index 9f21536ba..4cd51784f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/annotations/EnableDebuggingCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/annotations/EnableDebuggingCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.youtube.misc.enabledebugging.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.google.android.youtube", arrayOf() - )] -) +@Compatibility([Package("com.google.android.youtube")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class EnableDebuggingCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYEL.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYEL.kt index 77f1ba875..6223dfc03 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYEL.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYEL.kt @@ -32,7 +32,6 @@ object HDRBrightnessFingerprintYEL : MethodFingerprint( Opcode.IGET_OBJECT, Opcode.INVOKE_VIRTUAL ), - null, customFingerprint = { methodDef -> methodDef.implementation!!.instructions.any { ((it as? ReferenceInstruction)?.reference as? FieldReference)?.let { field -> diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYJK.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYJK.kt index f45743144..76250ebae 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYJK.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYJK.kt @@ -16,8 +16,8 @@ import org.jf.dexlib2.Opcode @HDRBrightnessCompatibility @Version("0.0.1") object HDRBrightnessFingerprintYJK : MethodFingerprint( - "V", null, null, - listOf( + "V", + opcodes = listOf( Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_VIRTUAL, @@ -27,5 +27,5 @@ object HDRBrightnessFingerprintYJK : MethodFingerprint( Opcode.IGET_OBJECT, Opcode.INVOKE_VIRTUAL ), - listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"), + strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"), ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt index ddd0439a4..d832a9809 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt @@ -2,8 +2,8 @@ package app.revanced.patches.youtube.misc.integrations.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility @Name("init-fingerprint") @@ -13,6 +13,5 @@ import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCo @IntegrationsCompatibility @Version("0.0.1") object InitFingerprint : MethodFingerprint( - null, null, null, null, - listOf("Application creation") + strings = listOf("Application creation") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt index 80b2db99b..a304b71f0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.youtube.misc.manifest.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.google.android.youtube", arrayOf() - )] -) +@Compatibility([Package("com.google.android.youtube")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class FixLocaleConfigErrorCompatibility \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt index 58e49167a..1d579e83c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt @@ -2,9 +2,9 @@ package app.revanced.patches.youtube.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility @Name("cast-context-fetch-fingerprint") @@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi @MicroGPatchCompatibility @Version("0.0.1") object CastContextFetchFingerprint : MethodFingerprint( - null, null, null, null, - listOf("Error fetching CastContext.") + strings = listOf("Error fetching CastContext.") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt index ae5d9a380..9dbccbbf6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt @@ -2,9 +2,9 @@ package app.revanced.patches.youtube.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility @Name("cast-module-fingerprint") @@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi @MicroGPatchCompatibility @Version("0.0.1") object CastDynamiteModuleFingerprint : MethodFingerprint( - null, null, null, null, - listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl") + strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt index 67d8c3fa7..d6ae5d4c9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt @@ -2,9 +2,9 @@ package app.revanced.patches.youtube.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility @Name("cast-context-fetch-fingerprint") @@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi @MicroGPatchCompatibility @Version("0.0.1") object CastDynamiteModuleV2Fingerprint : MethodFingerprint( - null, null, null, null, - listOf("Failed to load module via V2: ") + strings = listOf("Failed to load module via V2: ") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt index bccf4bcfa..dee3155fc 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt @@ -17,5 +17,8 @@ import org.jf.dexlib2.AccessFlags @MicroGPatchCompatibility @Version("0.0.1") object GooglePlayUtilityFingerprint : MethodFingerprint( - "I", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L"), null, listOf("This should never happen.", "MetadataValueReader", "com.google.android.gms") + "I", + AccessFlags.PUBLIC or AccessFlags.STATIC, + listOf("L", "L"), + strings = listOf("This should never happen.", "MetadataValueReader", "com.google.android.gms") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/IntegrityCheckFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/IntegrityCheckFingerprint.kt index bbd0a76f4..19a77f9a7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/IntegrityCheckFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/IntegrityCheckFingerprint.kt @@ -17,5 +17,6 @@ import org.jf.dexlib2.AccessFlags @MicroGPatchCompatibility @Version("0.0.1") object IntegrityCheckFingerprint : MethodFingerprint( - "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L"), null, listOf("This should never happen.", "GooglePlayServicesUtil", "Google Play Store signature invalid.") + "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L"), + strings = listOf("This should never happen.", "GooglePlayServicesUtil", "Google Play Store signature invalid.") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt index 71aa8d747..639e6d47f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt @@ -2,9 +2,9 @@ package app.revanced.patches.youtube.misc.microg.fingerprints import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility @Name("google-play-prime-fingerprint") @@ -15,5 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi @MicroGPatchCompatibility @Version("0.0.1") object PrimeFingerprint : MethodFingerprint( - null, null, null, null, listOf("com.google.android.GoogleCamera", "com.android.vending") + strings = listOf("com.google.android.GoogleCamera", "com.android.vending") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt index 816b552d8..8a069a43d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt @@ -17,6 +17,6 @@ import org.jf.dexlib2.AccessFlags @MicroGPatchCompatibility @Version("0.0.1") object ServiceCheckFingerprint : MethodFingerprint( - "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null - , listOf("Google Play Services not available", "GooglePlayServices not available due to error ") + "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), + strings = listOf("Google Play Services not available", "GooglePlayServices not available due to error ") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackKidsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackKidsFingerprint.kt index d7f9555b9..7557753cb 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackKidsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackKidsFingerprint.kt @@ -29,6 +29,5 @@ object MinimizedPlaybackKidsFingerprint : MethodFingerprint( Opcode.IGET, Opcode.INVOKE_STATIC ), - null, - { it.definingClass.endsWith("MinimizedPlaybackPolicyController;") } + customFingerprint = { it.definingClass.endsWith("MinimizedPlaybackPolicyController;") } ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt index c36f14f2a..65b90778d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt @@ -20,8 +20,7 @@ import org.jf.dexlib2.Opcode object MinimizedPlaybackSettingsFingerprint : MethodFingerprint( "L", AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - listOf( + opcodes = listOf( Opcode.INVOKE_VIRTUAL, Opcode.MOVE_RESULT, Opcode.INVOKE_VIRTUAL, diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt index ee86a246f..066de6918 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt @@ -18,12 +18,12 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction @PlayerControlsCompatibility @Version("0.0.1") object BottomControlsInflateFingerprint : MethodFingerprint( - null, null, null, listOf( + opcodes = listOf( Opcode.CHECK_CAST, Opcode.INVOKE_VIRTUAL, Opcode.MOVE_RESULT_OBJECT - ), null, - { methodDef -> + ), + customFingerprint = { methodDef -> methodDef.implementation?.instructions?.any { instruction -> (instruction as? WideLiteralInstruction)?.wideLiteral == PlayerControlsBytecodePatch.bottomUiContainerResourceId } == true diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt index e3500a1bd..ddb4d00f6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt @@ -15,7 +15,9 @@ import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControl @PlayerControlsCompatibility @Version("0.0.1") object PlayerControlsVisibilityFingerprint : MethodFingerprint( - "V", null, listOf("Z", "Z"), null, null, { methodDef -> + "V", + parameters = listOf("Z", "Z"), + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("YouTubeControlsOverlay;") } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt index 26ecae38b..a468346b8 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt @@ -15,7 +15,7 @@ import app.revanced.patches.youtube.misc.playeroverlay.annotation.PlayerOverlays @PlayerOverlaysHookCompatibility @Version("0.0.1") object PlayerOverlaysOnFinishInflateFingerprint : MethodFingerprint( - null, null, null, null, null, { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("YouTubePlayerOverlaysLayout;") && methodDef.name == "onFinishInflate" } ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt index 7bdac3ab8..55c98af9f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt @@ -22,8 +22,7 @@ import org.jf.dexlib2.Opcode object UpdatePlayerTypeFingerprint : MethodFingerprint( "V", AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - listOf( + opcodes = listOf( Opcode.INVOKE_VIRTUAL, Opcode.IGET_OBJECT, Opcode.IF_NE, diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/annotations/SettingsCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/annotations/SettingsCompatibility.kt index cf15bd921..5fa1408ad 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/annotations/SettingsCompatibility.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/annotations/SettingsCompatibility.kt @@ -3,11 +3,7 @@ package app.revanced.patches.youtube.misc.settings.annotations import app.revanced.patcher.annotation.Compatibility import app.revanced.patcher.annotation.Package -@Compatibility( - [Package( - "com.google.android.youtube", arrayOf() - )] -) +@Compatibility([Package("com.google.android.youtube")]) @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) internal annotation class SettingsCompatibility \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt index 3b58257ac..90f06116a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt @@ -15,12 +15,7 @@ import app.revanced.patches.youtube.misc.settings.annotations.SettingsCompatibil @SettingsCompatibility @Version("0.0.1") object LicenseActivityFingerprint : MethodFingerprint( - null, - null, - null, - null, - null, - { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("LicenseActivity;") && methodDef.name == "onCreate" } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ReVancedSettingsActivityFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ReVancedSettingsActivityFingerprint.kt index 60d0a06ce..c557ae3e2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ReVancedSettingsActivityFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ReVancedSettingsActivityFingerprint.kt @@ -15,12 +15,7 @@ import app.revanced.patches.youtube.misc.settings.annotations.SettingsCompatibil @SettingsCompatibility @Version("0.0.1") object ReVancedSettingsActivityFingerprint : MethodFingerprint( - null, - null, - null, - null, - null, - { methodDef -> + customFingerprint = { methodDef -> methodDef.definingClass.endsWith("ReVancedSettingActivity;") && methodDef.name == "initializeSettings" } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeSetterFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeSetterFingerprint.kt index 45c5b69a4..252a18a98 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeSetterFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeSetterFingerprint.kt @@ -17,11 +17,8 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction @Version("0.0.1") object ThemeSetterFingerprint : MethodFingerprint( "L", - null, - null, - listOf(Opcode.RETURN_OBJECT), - null, - { methodDef -> + opcodes = listOf(Opcode.RETURN_OBJECT), + customFingerprint = { methodDef -> methodDef.implementation?.instructions?.any { it.opcode.ordinal == Opcode.CONST.ordinal && (it as WideLiteralInstruction).wideLiteral == SettingsPatch.appearanceStringId } == true diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/MaxBufferFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/MaxBufferFingerprint.kt index cdab36112..284bfacc7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/MaxBufferFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/MaxBufferFingerprint.kt @@ -21,12 +21,11 @@ import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction object MaxBufferFingerprint : MethodFingerprint( "I", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(Opcode.SGET_OBJECT, Opcode.IGET, Opcode.IF_EQZ, Opcode.RETURN), - null, customFingerprint = { methodDef -> - methodDef.definingClass.equals("Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;") + methodDef.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;" && methodDef.implementation!!.instructions.any { ((it as? NarrowLiteralInstruction)?.narrowLiteral == 120000) - && methodDef.name.equals("r") + && methodDef.name == "r" } } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/PlaybackBufferFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/PlaybackBufferFingerprint.kt index 487485aa6..23618b661 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/PlaybackBufferFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/PlaybackBufferFingerprint.kt @@ -21,9 +21,8 @@ import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction object PlaybackBufferFingerprint : MethodFingerprint( "I", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(Opcode.IF_LEZ, Opcode.RETURN), - null, customFingerprint = { methodDef -> - methodDef.definingClass.equals("Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;") + methodDef.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;" && methodDef.implementation!!.instructions.any { ((it as? NarrowLiteralInstruction)?.narrowLiteral == 1600) } diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/ReBufferFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/ReBufferFingerprint.kt index e4fa0bd38..b6401af0c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/ReBufferFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/ReBufferFingerprint.kt @@ -21,9 +21,8 @@ import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction object ReBufferFingerprint : MethodFingerprint( "I", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(Opcode.IF_LEZ, Opcode.RETURN), - null, customFingerprint = { methodDef -> - methodDef.definingClass.equals("Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;") + methodDef.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;" && methodDef.implementation!!.instructions.any { ((it as? NarrowLiteralInstruction)?.narrowLiteral == 5000) }