From cab788d4ad22e9c13f333fc0cce078fe68649dda Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 24 Jan 2026 15:23:03 +0100 Subject: [PATCH] correct use of endsWith etc --- .../revanced/patches/cricbuzz/ads/Fingerprints.kt | 4 ++-- .../patches/googlenews/customtabs/Fingerprints.kt | 2 +- .../misc/extension/hooks/StartActivityInitHook.kt | 2 +- .../patches/googlenews/misc/gms/Fingerprints.kt | 4 ++-- .../patches/googlephotos/misc/extension/Hooks.kt | 2 +- .../patches/googlephotos/misc/gms/Fingerprints.kt | 4 ++-- .../googlerecorder/restrictions/Fingerprints.kt | 2 +- .../revanced/patches/hexeditor/ad/Fingerprints.kt | 2 +- .../patches/iconpackstudio/misc/pro/Fingerprints.kt | 4 ++-- .../detection/deviceintegrity/Fingerprints.kt | 4 ++-- .../idaustria/detection/signature/Fingerprints.kt | 2 +- .../revanced/patches/letterboxd/ads/Fingerprints.kt | 5 ++--- .../letterboxd/unlock/unlockAppIcons/Fingerprints.kt | 2 +- .../patches/music/layout/buttons/Fingerprints.kt | 2 +- .../revanced/patches/music/misc/gms/Fingerprints.kt | 6 ++---- .../patches/music/misc/settings/Fingerprints.kt | 4 ++-- .../patches/myfitnesspal/ads/Fingerprints.kt | 6 +++--- .../patches/orfon/detection/root/Fingerprints.kt | 4 ++-- .../app/revanced/patches/pandora/ads/Fingerprints.kt | 4 ++-- .../revanced/patches/pandora/misc/Fingerprints.kt | 4 ++-- .../photomath/misc/unlock/plus/Fingerprints.kt | 4 ++-- .../app/revanced/patches/pixiv/ads/Fingerprints.kt | 4 ++-- .../misc/annoyances/purchasereminder/Fingerprints.kt | 4 ++-- .../patches/reddit/ad/comments/Fingerprints.kt | 4 ++-- .../patches/reddit/ad/general/Fingerprints.kt | 6 +++--- .../customclients/boostforreddit/api/Fingerprints.kt | 6 +++--- .../joeyforreddit/detection/piracy/Fingerprints.kt | 8 ++++---- .../reddit/customclients/slide/api/Fingerprints.kt | 4 ++-- .../syncforreddit/annoyances/startup/Fingerprints.kt | 4 ++-- .../sync/syncforreddit/api/Fingerprints.kt | 12 ++++++------ .../sync/syncforreddit/fix/redgifs/Fingerprints.kt | 4 ++-- .../sync/syncforreddit/fix/slink/Fingerprints.kt | 8 ++++---- .../sync/syncforreddit/fix/thumbnail/Fingerprints.kt | 4 ++-- .../layout/disablescreenshotpopup/Fingerprints.kt | 4 ++-- .../reddit/layout/premiumicon/Fingerprints.kt | 4 ++-- .../patches/reddit/misc/tracking/url/Fingerprints.kt | 4 ++-- .../serviceportalbund/detection/root/Fingerprints.kt | 2 +- .../shared/misc/fix/verticalscroll/Fingerprints.kt | 2 +- .../revanced/patches/strava/password/Fingerprints.kt | 5 ++--- .../patches/strava/subscription/Fingerprints.kt | 2 +- .../patches/strava/upselling/Fingerprints.kt | 2 +- .../ticktick/misc/themeunlock/Fingerprints.kt | 4 ++-- .../tiktok/interaction/cleardisplay/Fingerprints.kt | 2 +- .../tiktok/interaction/downloads/Fingerprints.kt | 12 ++++++------ .../patches/tiktok/interaction/speed/Fingerprints.kt | 4 ++-- .../revanced/patches/twitch/ad/audio/Fingerprints.kt | 2 +- .../revanced/patches/twitch/ad/video/Fingerprints.kt | 6 +++--- .../patches/twitch/chat/antidelete/Fingerprints.kt | 6 +++--- .../patches/twitch/chat/autoclaim/Fingerprints.kt | 2 +- .../revanced/patches/twitch/debug/Fingerprints.kt | 6 +++--- .../patches/twitch/misc/settings/Fingerprints.kt | 8 ++++---- .../warnwetter/misc/promocode/Fingerprints.kt | 4 ++-- .../youtube/layout/buttons/overlay/Fingerprints.kt | 2 +- 53 files changed, 110 insertions(+), 114 deletions(-) diff --git a/patches/src/main/kotlin/app/revanced/patches/cricbuzz/ads/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/cricbuzz/ads/Fingerprints.kt index cf145e7b8..5c8acf985 100644 --- a/patches/src/main/kotlin/app/revanced/patches/cricbuzz/ads/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/cricbuzz/ads/Fingerprints.kt @@ -9,7 +9,7 @@ internal val BytecodePatchContext.userStateSwitchMethod by gettingFirstMutableMe } internal val BytecodePatchContext.cb11ConstructorMethod by gettingFirstMutableMethodDeclaratively { - definingClass("CB11Details;"::endsWith) + definingClass { endsWith("CB11Details;") } parameterTypes( "Ljava/lang/String;", "Ljava/lang/String;", @@ -26,5 +26,5 @@ internal val BytecodePatchContext.cb11ConstructorMethod by gettingFirstMutableMe internal val BytecodePatchContext.getBottomBarMethod by gettingFirstMutableMethodDeclaratively { name("getBottombar") - definingClass("HomeMenu;"::endsWith) + definingClass { endsWith("HomeMenu;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/googlenews/customtabs/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/googlenews/customtabs/Fingerprints.kt index edf6ccdc2..74ffbb3e8 100644 --- a/patches/src/main/kotlin/app/revanced/patches/googlenews/customtabs/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/googlenews/customtabs/Fingerprints.kt @@ -8,7 +8,7 @@ import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode internal val launchCustomTabMethodMatch = firstMethodComposite { - definingClass("CustomTabsArticleLauncher;"::endsWith) + definingClass { endsWith("CustomTabsArticleLauncher;") } accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR) opcodes( Opcode.IPUT_OBJECT, diff --git a/patches/src/main/kotlin/app/revanced/patches/googlenews/misc/extension/hooks/StartActivityInitHook.kt b/patches/src/main/kotlin/app/revanced/patches/googlenews/misc/extension/hooks/StartActivityInitHook.kt index e3ea85bd5..1662b8ea3 100644 --- a/patches/src/main/kotlin/app/revanced/patches/googlenews/misc/extension/hooks/StartActivityInitHook.kt +++ b/patches/src/main/kotlin/app/revanced/patches/googlenews/misc/extension/hooks/StartActivityInitHook.kt @@ -28,7 +28,7 @@ internal val startActivityInitHook = extensionHook( }, ) { name("onCreate") - definingClass("/StartActivity;"::endsWith) + definingClass { endsWith("/StartActivity;") } instructions( Opcode.INVOKE_STATIC(), Opcode.MOVE_RESULT(), diff --git a/patches/src/main/kotlin/app/revanced/patches/googlenews/misc/gms/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/googlenews/misc/gms/Fingerprints.kt index 9e69b22dc..2886f60f1 100644 --- a/patches/src/main/kotlin/app/revanced/patches/googlenews/misc/gms/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/googlenews/misc/gms/Fingerprints.kt @@ -1,11 +1,11 @@ package app.revanced.patches.googlenews.misc.gms -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.magazinesActivityOnCreateMethod by gettingFirstMutableMethodDeclaratively { name("onCreate") - definingClass("/StartActivity;"::endsWith) + definingClass { endsWith("/StartActivity;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/extension/Hooks.kt b/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/extension/Hooks.kt index 9fdbdea9a..be1f75b8c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/extension/Hooks.kt +++ b/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/extension/Hooks.kt @@ -28,7 +28,7 @@ internal val homeActivityInitHook = extensionHook( }, ) { name("onCreate") - definingClass("/HomeActivity;"::endsWith) + definingClass { endsWith("/HomeActivity;") } instructions( Opcode.CONST_STRING(), Opcode.INVOKE_STATIC(), diff --git a/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/Fingerprints.kt index 07762f6b1..47de04573 100644 --- a/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/Fingerprints.kt @@ -1,11 +1,11 @@ package app.revanced.patches.googlephotos.misc.gms -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.homeActivityOnCreateMethod by gettingFirstMutableMethodDeclaratively { name("onCreate") - definingClass("/HomeActivity;"::endsWith) + definingClass { endsWith("/HomeActivity;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/Fingerprints.kt index 8f4734bfc..7b2e615be 100644 --- a/patches/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/Fingerprints.kt @@ -4,6 +4,6 @@ import app.revanced.patcher.* internal val onApplicationCreateMethodMatch = firstMethodComposite { name("onCreate") - definingClass("RecorderApplication"::endsWith) + definingClass { endsWith("RecorderApplication") } instructions("com.google.android.feature.PIXEL_2017_EXPERIENCE"()) } diff --git a/patches/src/main/kotlin/app/revanced/patches/hexeditor/ad/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/hexeditor/ad/Fingerprints.kt index fabf86ca2..a950e440c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/hexeditor/ad/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/hexeditor/ad/Fingerprints.kt @@ -7,5 +7,5 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.primaryAdsMethod by gettingFirstMutableMethodDeclaratively { name("isAdsDisabled") - definingClass("PreferencesHelper;"::endsWith) + definingClass { endsWith("PreferencesHelper;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/Fingerprints.kt index 15b84aeea..f3976a6de 100644 --- a/patches/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/Fingerprints.kt @@ -6,6 +6,6 @@ import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType internal val BytecodePatchContext.checkProMethod by gettingFirstMutableMethodDeclaratively { - definingClass("IPSPurchaseRepository;"::endsWith) + definingClass { endsWith("IPSPurchaseRepository;") } returnType("Z") -} \ No newline at end of file +} diff --git a/patches/src/main/kotlin/app/revanced/patches/idaustria/detection/deviceintegrity/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/idaustria/detection/deviceintegrity/Fingerprints.kt index 312b72581..fe779ed26 100644 --- a/patches/src/main/kotlin/app/revanced/patches/idaustria/detection/deviceintegrity/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/idaustria/detection/deviceintegrity/Fingerprints.kt @@ -6,14 +6,14 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.isDeviceBootloaderOpenMethod by gettingFirstMutableMethodDeclaratively { name("isDeviceBootloaderOpen") - definingClass("/DeviceIntegrityCheckProviderImpl;"::endsWith) + definingClass { endsWith("/DeviceIntegrityCheckProviderImpl;") } accessFlags(AccessFlags.PUBLIC) returnType("Ljava/lang/Object;") } internal val BytecodePatchContext.isDeviceRootedMethod by gettingFirstMutableMethodDeclaratively { name("isDeviceRooted") - definingClass("/DeviceIntegrityCheckProviderImpl;"::endsWith) + definingClass { endsWith("/DeviceIntegrityCheckProviderImpl;") } accessFlags(AccessFlags.PUBLIC) returnType("Z") } diff --git a/patches/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/Fingerprints.kt index a2013d3e2..1403c7984 100644 --- a/patches/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/Fingerprints.kt @@ -6,7 +6,7 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.spoofSignatureMethod by gettingFirstMutableMethodDeclaratively { name("getPubKey") - definingClass("/SL2Step1Task;"::endsWith) + definingClass { endsWith("/SL2Step1Task;") } accessFlags(AccessFlags.PRIVATE) returnType("L") parameterTypes("L") diff --git a/patches/src/main/kotlin/app/revanced/patches/letterboxd/ads/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/letterboxd/ads/Fingerprints.kt index 4ca73f740..9f6cf2370 100644 --- a/patches/src/main/kotlin/app/revanced/patches/letterboxd/ads/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/letterboxd/ads/Fingerprints.kt @@ -19,11 +19,10 @@ internal val BytecodePatchContext.admobHelperShouldShowAdsMethod by gettingFirst internal val BytecodePatchContext.filmFragmentShowAdsMethod by gettingFirstMutableMethodDeclaratively { name("showAds") - definingClass("/FilmFragment;"::endsWith) - + definingClass { endsWith("/FilmFragment;") } } internal val BytecodePatchContext.memberExtensionShowAdsMethod by gettingFirstMutableMethodDeclaratively { name("showAds") - definingClass("/AMemberExtensionKt;"::endsWith) + definingClass { endsWith("/AMemberExtensionKt;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/letterboxd/unlock/unlockAppIcons/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/letterboxd/unlock/unlockAppIcons/Fingerprints.kt index 3e7d389fd..ca74736b5 100644 --- a/patches/src/main/kotlin/app/revanced/patches/letterboxd/unlock/unlockAppIcons/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/letterboxd/unlock/unlockAppIcons/Fingerprints.kt @@ -7,5 +7,5 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.getCanChangeAppIconMethod by gettingFirstMutableMethodDeclaratively { name("getCanChangeAppIcon") - definingClass("SettingsAppIconFragment;"::endsWith) + definingClass { endsWith("SettingsAppIconFragment;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/buttons/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/buttons/Fingerprints.kt index b7c2b4d1b..e24bc7807 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/layout/buttons/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/buttons/Fingerprints.kt @@ -59,7 +59,7 @@ internal val BytecodePatchContext.historyMenuItemOfflineTabMethod by gettingFirs } internal val BytecodePatchContext.searchActionViewMethod by gettingFirstMutableMethodDeclaratively { - definingClass("/SearchActionProvider;"::endsWith) + definingClass { endsWith("/SearchActionProvider;") } accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returnType("Landroid/view/View;") parameterTypes() diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/gms/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/gms/Fingerprints.kt index 061aede41..ad65b0dab 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/misc/gms/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/gms/Fingerprints.kt @@ -1,13 +1,11 @@ package app.revanced.patches.music.misc.gms import app.revanced.patcher.* -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.patch.BytecodePatchContext - internal val BytecodePatchContext.musicActivityOnCreateMethod by gettingFirstMutableMethodDeclaratively { name("onCreate") - definingClass("/MusicActivity;"::endsWith) + definingClass { endsWith("/MusicActivity;") } returnType("V") parameterTypes("Landroid/os/Bundle;") -} \ No newline at end of file +} diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/Fingerprints.kt index 5c2445752..6932f1629 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/Fingerprints.kt @@ -1,7 +1,7 @@ package app.revanced.patches.music.misc.settings -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.parameterTypes import app.revanced.patcher.patch.BytecodePatchContext @@ -9,7 +9,7 @@ import app.revanced.patcher.returnType internal val BytecodePatchContext.googleApiActivityMethod by gettingFirstMutableMethodDeclaratively { name("onCreate") - definingClass("GoogleApiActivity;"::endsWith) + definingClass { endsWith("GoogleApiActivity;") } returnType("V") parameterTypes("Landroid/os/Bundle;") } diff --git a/patches/src/main/kotlin/app/revanced/patches/myfitnesspal/ads/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/myfitnesspal/ads/Fingerprints.kt index b3bfbaac0..557f2a289 100644 --- a/patches/src/main/kotlin/app/revanced/patches/myfitnesspal/ads/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/myfitnesspal/ads/Fingerprints.kt @@ -1,8 +1,8 @@ package app.revanced.patches.myfitnesspal.ads -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.accessFlags import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType @@ -10,13 +10,13 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.isPremiumUseCaseImplMethod by gettingFirstMutableMethodDeclaratively { name("doWork") - definingClass("IsPremiumUseCaseImpl;"::endsWith) + definingClass { endsWith("IsPremiumUseCaseImpl;") } accessFlags(AccessFlags.PUBLIC) } internal val BytecodePatchContext.mainActivityNavigateToNativePremiumUpsellMethod by gettingFirstMutableMethodDeclaratively { name("navigateToNativePremiumUpsell") - definingClass("MainActivity;"::endsWith) + definingClass { endsWith("MainActivity;") } accessFlags(AccessFlags.PRIVATE, AccessFlags.FINAL) returnType("V") } diff --git a/patches/src/main/kotlin/app/revanced/patches/orfon/detection/root/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/orfon/detection/root/Fingerprints.kt index 97edc52e2..057fac319 100644 --- a/patches/src/main/kotlin/app/revanced/patches/orfon/detection/root/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/orfon/detection/root/Fingerprints.kt @@ -1,8 +1,8 @@ package app.revanced.patches.orfon.detection.root -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.accessFlags import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType @@ -10,7 +10,7 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.isDeviceRootedMethod by gettingFirstMutableMethodDeclaratively { name("isDeviceRooted") - definingClass("/RootChecker;"::endsWith) + definingClass { endsWith("/RootChecker;") } accessFlags(AccessFlags.PUBLIC) returnType("Z") } diff --git a/patches/src/main/kotlin/app/revanced/patches/pandora/ads/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/pandora/ads/Fingerprints.kt index 9f1517a5a..379f54cc6 100644 --- a/patches/src/main/kotlin/app/revanced/patches/pandora/ads/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/pandora/ads/Fingerprints.kt @@ -1,7 +1,7 @@ package app.revanced.patches.pandora.ads -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext @@ -12,5 +12,5 @@ internal val BytecodePatchContext.getIsAdSupportedMethod by gettingFirstMutableM internal val BytecodePatchContext.requestAudioAdMethod by gettingFirstMutableMethodDeclaratively { name("requestAudioAdFromAdSDK") - definingClass("ContentServiceOpsImpl;"::endsWith) + definingClass { endsWith("ContentServiceOpsImpl;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/pandora/misc/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/pandora/misc/Fingerprints.kt index fd385cbb0..30d517477 100644 --- a/patches/src/main/kotlin/app/revanced/patches/pandora/misc/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/pandora/misc/Fingerprints.kt @@ -1,11 +1,11 @@ package app.revanced.patches.pandora.misc -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.getSkipLimitBehaviorMethod by gettingFirstMutableMethodDeclaratively { name("getSkipLimitBehavior") - definingClass("UserData;"::endsWith) + definingClass { endsWith("UserData;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/Fingerprints.kt index 65a8c1b21..82eb72130 100644 --- a/patches/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/Fingerprints.kt @@ -1,8 +1,8 @@ package app.revanced.patches.photomath.misc.unlock.plus -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.accessFlags import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType import com.android.tools.smali.dexlib2.AccessFlags @@ -10,5 +10,5 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.isPlusUnlockedMethod by gettingFirstMutableMethodDeclaratively("genius") { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returnType("Z") - definingClass("/User;"::endsWith) + definingClass { endsWith("/User;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/pixiv/ads/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/pixiv/ads/Fingerprints.kt index 2fb8c5b4b..2f535ba93 100644 --- a/patches/src/main/kotlin/app/revanced/patches/pixiv/ads/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/pixiv/ads/Fingerprints.kt @@ -1,15 +1,15 @@ package app.revanced.patches.pixiv.ads -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.accessFlags import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.shouldShowAdsMethod by gettingFirstMutableMethodDeclaratively { - definingClass("AdUtils;"::endsWith) + definingClass { endsWith("AdUtils;") } name("shouldShowAds") accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returnType("Z") diff --git a/patches/src/main/kotlin/app/revanced/patches/rar/misc/annoyances/purchasereminder/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/rar/misc/annoyances/purchasereminder/Fingerprints.kt index d7f859b57..d22393226 100644 --- a/patches/src/main/kotlin/app/revanced/patches/rar/misc/annoyances/purchasereminder/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/rar/misc/annoyances/purchasereminder/Fingerprints.kt @@ -1,15 +1,15 @@ package app.revanced.patches.rar.misc.annoyances.purchasereminder -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.accessFlags import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.showReminderMethod by gettingFirstMutableMethodDeclaratively { - definingClass("AdsNotify;"::endsWith) + definingClass { endsWith("AdsNotify;") } name("show") accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC) returnType("V") diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/ad/comments/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/ad/comments/Fingerprints.kt index 593d494f1..0e7bfdf62 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/ad/comments/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/ad/comments/Fingerprints.kt @@ -1,11 +1,11 @@ package app.revanced.patches.reddit.ad.comments -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.hideCommentAdsMethod by gettingFirstMutableMethodDeclaratively { name("invokeSuspend") - definingClass("LoadAdsCombinedCall"::contains) + definingClass { contains("LoadAdsCombinedCall") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/ad/general/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/ad/general/Fingerprints.kt index 864bfe2fe..b27be4a7e 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/ad/general/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/ad/general/Fingerprints.kt @@ -1,7 +1,7 @@ package app.revanced.patches.reddit.ad.general -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.instructions import app.revanced.patcher.invoke import app.revanced.patcher.patch.BytecodePatchContext @@ -9,13 +9,13 @@ import app.revanced.patcher.returnType import com.android.tools.smali.dexlib2.Opcode internal val BytecodePatchContext.adPostMethod by gettingFirstMutableMethodDeclaratively("children") { - definingClass("Listing;"::endsWith) + definingClass { endsWith("Listing;") } returnType("V") } internal val BytecodePatchContext.newAdPostMethod by gettingFirstMutableMethodDeclaratively( "feedElement", - "com.reddit.cookie" + "com.reddit.cookie", ) { instructions(Opcode.INVOKE_VIRTUAL()) } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/Fingerprints.kt index 455ffae45..fad04c599 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/Fingerprints.kt @@ -1,15 +1,15 @@ package app.revanced.patches.reddit.customclients.boostforreddit.api -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.buildUserAgentMethod by gettingFirstMutableMethodDeclaratively( - "%s:%s:%s (by /u/%s)" + "%s:%s:%s (by /u/%s)", ) internal val BytecodePatchContext.getClientIdMethod by gettingFirstMutableMethodDeclaratively { name("getClientId") - definingClass("Credentials;"::endsWith) + definingClass { endsWith("Credentials;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/Fingerprints.kt index ebc7348d6..2adc8db25 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/Fingerprints.kt @@ -1,10 +1,10 @@ package app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively -import app.revanced.patcher.invoke import app.revanced.patcher.accessFlags import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.instructions +import app.revanced.patcher.invoke import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType import com.android.tools.smali.dexlib2.AccessFlags @@ -19,7 +19,7 @@ internal val BytecodePatchContext.detectPiracyMethod by gettingFirstMutableMetho Opcode.CONST_WIDE_16(), Opcode.INVOKE_DIRECT(), Opcode.INVOKE_VIRTUAL(), - Opcode.RETURN_VOID() + Opcode.RETURN_VOID(), ) - definingClass("ProcessLifeCyleListener;"::endsWith) + definingClass { endsWith("ProcessLifeCyleListener;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/Fingerprints.kt index 15d500c48..538d646b1 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/Fingerprints.kt @@ -1,11 +1,11 @@ package app.revanced.patches.reddit.customclients.slide.api -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.getClientIdMethod by gettingFirstMutableMethodDeclaratively { name("getClientId") - definingClass("Credentials;"::endsWith) + definingClass { endsWith("Credentials;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/annoyances/startup/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/annoyances/startup/Fingerprints.kt index 163c959b3..20e60a3fa 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/annoyances/startup/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/annoyances/startup/Fingerprints.kt @@ -1,11 +1,11 @@ package app.revanced.patches.reddit.customclients.sync.syncforreddit.annoyances.startup -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.mainActivityOnCreateMethod by gettingFirstMutableMethodDeclaratively { name("onCreate") - definingClass("MainActivity;"::endsWith) + definingClass { endsWith("MainActivity;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/api/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/api/Fingerprints.kt index 899c48f2c..5ca6baf3c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/api/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/api/Fingerprints.kt @@ -1,22 +1,22 @@ package app.revanced.patches.reddit.customclients.sync.syncforreddit.api -import app.revanced.patcher.gettingFirstMutableMethod -import app.revanced.patcher.invoke -import app.revanced.patcher.string import app.revanced.patcher.firstMethodComposite +import app.revanced.patcher.gettingFirstMutableMethod import app.revanced.patcher.instructions +import app.revanced.patcher.invoke import app.revanced.patcher.patch.BytecodePatchContext +import app.revanced.patcher.string internal val getAuthorizationStringMethodMatch = firstMethodComposite { - instructions(string("authorize.compact?client_id"::startsWith)) + instructions(string { startsWith("authorize.compact?client_id") }) } internal val getBearerTokenMethodMatch = firstMethodComposite { - instructions(string("Basic"::startsWith)) + instructions(string { startsWith("Basic") }) } internal val BytecodePatchContext.getUserAgentMethod by gettingFirstMutableMethod( - "android:com.laurencedawson.reddit_sync" + "android:com.laurencedawson.reddit_sync", ) internal val imgurImageAPIMethodMatch = firstMethodComposite { diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/redgifs/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/redgifs/Fingerprints.kt index 480372485..600a591fd 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/redgifs/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/redgifs/Fingerprints.kt @@ -1,8 +1,8 @@ package app.revanced.patches.reddit.customclients.sync.syncforreddit.fix.redgifs import app.revanced.patcher.* -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.extensions.instructions +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.util.indexOfFirstInstruction import app.revanced.util.writeRegister @@ -33,7 +33,7 @@ internal val BytecodePatchContext.getDefaultUserAgentMethod by gettingFirstMutab internal val BytecodePatchContext.getOriginalUserAgentMethod by gettingFirstMutableMethodDeclaratively { accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC) - returnType("Ljava/lang/String;"::startsWith) + returnType { startsWith("Ljava/lang/String;") } parameterTypes() custom { immutableClassDef.sourceFile == "AccountSingleton.java" } } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/slink/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/slink/Fingerprints.kt index 9ac24cc13..5b1d12e13 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/slink/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/slink/Fingerprints.kt @@ -1,17 +1,17 @@ package app.revanced.patches.reddit.customclients.sync.syncforreddit.fix.slink +import app.revanced.patcher.definingClass import app.revanced.patcher.gettingFirstMutableMethod import app.revanced.patcher.gettingFirstMutableMethodDeclaratively -import app.revanced.patcher.definingClass import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType - internal val BytecodePatchContext.linkHelperOpenLinkMethod by gettingFirstMutableMethod("Link title: ") internal val BytecodePatchContext.setAuthorizationHeaderMethod by gettingFirstMutableMethodDeclaratively( - "Authorization", "bearer " + "Authorization", + "bearer ", ) { definingClass("Lcom/laurencedawson/reddit_sync/singleton/a;") - returnType("Ljava/util/HashMap;"::equals) + returnType { equals("Ljava/util/HashMap;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/thumbnail/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/thumbnail/Fingerprints.kt index 987d28b1b..ddf0354fb 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/thumbnail/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/thumbnail/Fingerprints.kt @@ -1,14 +1,14 @@ package app.revanced.patches.reddit.customclients.sync.syncforreddit.fix.thumbnail -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.accessFlags import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.parameterTypes import app.revanced.patcher.patch.BytecodePatchContext import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.customImageViewLoadMethod by gettingFirstMutableMethodDeclaratively { - definingClass("CustomImageView;"::endsWith) + definingClass { endsWith("CustomImageView;") } accessFlags(AccessFlags.PUBLIC) parameterTypes("Ljava/lang/String;", "Z", "Z", "I", "I") } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/Fingerprints.kt index 1e907fed1..fd2f0f30e 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/Fingerprints.kt @@ -1,7 +1,7 @@ package app.revanced.patches.reddit.layout.disablescreenshotpopup -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.parameterTypes import app.revanced.patcher.patch.BytecodePatchContext @@ -9,7 +9,7 @@ import app.revanced.patcher.returnType internal val BytecodePatchContext.disableScreenshotPopupMethod by gettingFirstMutableMethodDeclaratively { name("invoke") - definingClass($$"$ScreenshotTakenBannerKt$lambda-1$1;"::endsWith) + definingClass { endsWith($$"$ScreenshotTakenBannerKt$lambda-1$1;") } returnType("V") parameterTypes("Landroidx/compose/runtime/", "I") } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/Fingerprints.kt index 119d179e3..0ecf82169 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/Fingerprints.kt @@ -1,13 +1,13 @@ package app.revanced.patches.reddit.layout.premiumicon -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext import app.revanced.patcher.returnType internal val BytecodePatchContext.hasPremiumIconAccessMethod by gettingFirstMutableMethodDeclaratively { name("isPremiumSubscriber") - definingClass("MyAccount;"::endsWith) + definingClass { endsWith("MyAccount;") } returnType("Z") } diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/Fingerprints.kt index 679b989b6..578fe72b6 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/Fingerprints.kt @@ -1,12 +1,12 @@ package app.revanced.patches.reddit.misc.tracking.url -import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.custom import app.revanced.patcher.definingClass +import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.immutableClassDef import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.shareLinkFormatterMethod by gettingFirstMutableMethodDeclaratively { - definingClass("Lcom/reddit/sharing/"::startsWith) + definingClass { startsWith("Lcom/reddit/sharing/") } custom { immutableClassDef.sourceFile == "UrlUtil.kt" } } diff --git a/patches/src/main/kotlin/app/revanced/patches/serviceportalbund/detection/root/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/serviceportalbund/detection/root/Fingerprints.kt index db7840a8e..f03c5f311 100644 --- a/patches/src/main/kotlin/app/revanced/patches/serviceportalbund/detection/root/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/serviceportalbund/detection/root/Fingerprints.kt @@ -8,7 +8,7 @@ import app.revanced.patcher.returnType import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.rootDetectionMethod by gettingFirstMutableMethodDeclaratively { - definingClass("/DeviceIntegrityCheck;"::endsWith) + definingClass { endsWith("/DeviceIntegrityCheck;") } accessFlags(AccessFlags.PUBLIC) returnType("V") } diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/Fingerprints.kt index daac7b43f..cf7e2aa6d 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/Fingerprints.kt @@ -5,7 +5,7 @@ import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode internal val canScrollVerticallyMethodMatch = firstMethodComposite { - definingClass("SwipeRefreshLayout;"::endsWith) + definingClass { endsWith("SwipeRefreshLayout;") } accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returnType("Z") parameterTypes() diff --git a/patches/src/main/kotlin/app/revanced/patches/strava/password/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/strava/password/Fingerprints.kt index fd964cb86..045775b89 100644 --- a/patches/src/main/kotlin/app/revanced/patches/strava/password/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/strava/password/Fingerprints.kt @@ -5,13 +5,12 @@ import app.revanced.patcher.gettingFirstMutableMethodDeclaratively import app.revanced.patcher.name import app.revanced.patcher.patch.BytecodePatchContext - internal val BytecodePatchContext.logInGetUsePasswordMethod by gettingFirstMutableMethodDeclaratively { name("getUsePassword") - definingClass("/RequestOtpLogInNetworkResponse;"::endsWith) + definingClass { endsWith("/RequestOtpLogInNetworkResponse;") } } internal val BytecodePatchContext.emailChangeGetUsePasswordMethod by gettingFirstMutableMethodDeclaratively { name("getUsePassword") - definingClass("/RequestEmailChangeWithOtpOrPasswordResponse;"::endsWith) + definingClass { endsWith("/RequestEmailChangeWithOtpOrPasswordResponse;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/strava/subscription/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/strava/subscription/Fingerprints.kt index 2632d975b..85cb9ea83 100644 --- a/patches/src/main/kotlin/app/revanced/patches/strava/subscription/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/strava/subscription/Fingerprints.kt @@ -7,5 +7,5 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.getSubscribedMethod by gettingFirstMutableMethodDeclaratively { name("getSubscribed") - definingClass("/SubscriptionDetailResponse;"::endsWith) + definingClass { endsWith("/SubscriptionDetailResponse;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/strava/upselling/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/strava/upselling/Fingerprints.kt index 0db287d75..856db0d00 100644 --- a/patches/src/main/kotlin/app/revanced/patches/strava/upselling/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/strava/upselling/Fingerprints.kt @@ -8,6 +8,6 @@ import com.android.tools.smali.dexlib2.Opcode internal val getModulesMethodMatch = firstMethodComposite { name("getModules") - definingClass("/GenericLayoutEntry;"::endsWith) + definingClass { endsWith("/GenericLayoutEntry;") } opcodes(Opcode.IGET_OBJECT) } diff --git a/patches/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/Fingerprints.kt index ef3d892ea..80a53fe10 100644 --- a/patches/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/Fingerprints.kt @@ -7,10 +7,10 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.checkLockedThemesFingerprint by gettingFirstMutableMethodDeclaratively { name("isLockedTheme") - definingClass("Theme;"::endsWith) + definingClass { endsWith("Theme;") } } internal val BytecodePatchContext.setThemeMethod by gettingFirstMutableMethodDeclaratively { name("lambda\$updateUserBtn\$1") - definingClass("ThemePreviewActivity;"::endsWith) + definingClass { endsWith("ThemePreviewActivity;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/Fingerprints.kt index aa0f7038e..94d9016bd 100644 --- a/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/Fingerprints.kt @@ -8,5 +8,5 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.onClearDisplayEventMethod by gettingFirstMutableMethodDeclaratively { // Internally the feature is called "Clear mode". name("onClearModeEvent") - definingClass("/ClearModePanelComponent;"::endsWith) + definingClass { endsWith("/ClearModePanelComponent;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/Fingerprints.kt index c33af94d5..b55e77a9c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/Fingerprints.kt @@ -11,19 +11,19 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.aclCommonShareMethod by gettingFirstMutableMethodDeclaratively { name("getCode") - definingClass("/ACLCommonShare;"::endsWith) + definingClass { endsWith("/ACLCommonShare;") } accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returnType("I") } internal val BytecodePatchContext.aclCommonShare2Method by gettingFirstMutableMethodDeclaratively { name("getShowType") - definingClass("/ACLCommonShare;"::endsWith) + definingClass { endsWith("/ACLCommonShare;") } accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returnType("I") } internal val BytecodePatchContext.aclCommonShare3Method by gettingFirstMutableMethodDeclaratively { name("getTranscode") - definingClass("/ACLCommonShare;"::endsWith) + definingClass { endsWith("/ACLCommonShare;") } accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returnType("I") } @@ -31,12 +31,12 @@ internal val BytecodePatchContext.downloadUriMethod by gettingFirstMutableMethod "/", "/Camera", "/Camera/", - "video/mp4" + "video/mp4", ) { accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC) returnType("Landroid/net/Uri;") parameterTypes( "Landroid/content/Context;", - "Ljava/lang/String;" + "Ljava/lang/String;", ) -} \ No newline at end of file +} diff --git a/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/Fingerprints.kt index cc7d7da4d..29a67bb66 100644 --- a/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/Fingerprints.kt @@ -6,11 +6,11 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.getSpeedMethod by gettingFirstMutableMethodDeclaratively { name("onFeedSpeedSelectedEvent") - definingClass("/BaseListFragmentPanel;"::endsWith) + definingClass { endsWith("/BaseListFragmentPanel;") } } internal val BytecodePatchContext.setSpeedMethod by gettingFirstMutableMethodDeclaratively("enterFrom") { accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC) returnType("V") parameterTypes("Ljava/lang/String;", "Lcom/ss/android/ugc/aweme/feed/model/Aweme;", "F") -} \ No newline at end of file +} diff --git a/patches/src/main/kotlin/app/revanced/patches/twitch/ad/audio/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/twitch/ad/audio/Fingerprints.kt index 03c732675..6d7d32feb 100644 --- a/patches/src/main/kotlin/app/revanced/patches/twitch/ad/audio/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/twitch/ad/audio/Fingerprints.kt @@ -7,5 +7,5 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.audioAdsPresenterPlayMethod by gettingFirstMutableMethodDeclaratively { name("playAd") - definingClass("AudioAdsPlayerPresenter;"::endsWith) + definingClass { endsWith("AudioAdsPlayerPresenter;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/twitch/ad/video/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/twitch/ad/video/Fingerprints.kt index 3c7edc82b..481d6d869 100644 --- a/patches/src/main/kotlin/app/revanced/patches/twitch/ad/video/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/twitch/ad/video/Fingerprints.kt @@ -5,21 +5,21 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.checkAdEligibilityLambdaMethod by gettingFirstMutableMethodDeclaratively { name("shouldRequestAd") - definingClass("/AdEligibilityFetcher;"::endsWith) + definingClass { endsWith("/AdEligibilityFetcher;") } returnType("Lio/reactivex/Single;") parameterTypes("L") } internal val BytecodePatchContext.contentConfigShowAdsMethod by gettingFirstMutableMethodDeclaratively { name("getShowAds") - definingClass("/ContentConfigData;"::endsWith) + definingClass { endsWith("/ContentConfigData;") } returnType("Z") parameterTypes() } internal val BytecodePatchContext.getReadyToShowAdMethod by gettingFirstMutableMethodDeclaratively { name("getReadyToShowAdOrAbort") - definingClass("/StreamDisplayAdsPresenter;"::endsWith) + definingClass { endsWith("/StreamDisplayAdsPresenter;") } returnType("Ltv/twitch/android/core/mvp/presenter/StateAndAction;") parameterTypes("L", "L") } diff --git a/patches/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/Fingerprints.kt index bb13ef0ef..f784546f7 100644 --- a/patches/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/Fingerprints.kt @@ -9,15 +9,15 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.chatUtilCreateDeletedSpanMethod by gettingFirstMutableMethodDeclaratively { name("createDeletedSpanFromChatMessageSpan") - definingClass("ChatUtil\$Companion;"::endsWith) + definingClass { endsWith("ChatUtil\$Companion;") } } internal val BytecodePatchContext.deletedMessageClickableSpanCtorMethod by gettingFirstMutableMethodDeclaratively { - definingClass("DeletedMessageClickableSpan;"::endsWith) + definingClass { endsWith("DeletedMessageClickableSpan;") } accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR) } internal val BytecodePatchContext.setHasModAccessMethod by gettingFirstMutableMethodDeclaratively { name("setHasModAccess") - definingClass("DeletedMessageClickableSpan;"::endsWith) + definingClass { endsWith("DeletedMessageClickableSpan;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/Fingerprints.kt index f5bc9523c..417cc9e8b 100644 --- a/patches/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/Fingerprints.kt @@ -7,5 +7,5 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.communityPointsButtonViewDelegateMethod by gettingFirstMutableMethodDeclaratively { name("showClaimAvailable") - definingClass("CommunityPointsButtonViewDelegate;"::endsWith) + definingClass { endsWith("CommunityPointsButtonViewDelegate;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/twitch/debug/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/twitch/debug/Fingerprints.kt index 16513e233..13f6c50ae 100644 --- a/patches/src/main/kotlin/app/revanced/patches/twitch/debug/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/twitch/debug/Fingerprints.kt @@ -7,15 +7,15 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.isDebugConfigEnabledMethod by gettingFirstMutableMethodDeclaratively { name("isDebugConfigEnabled") - definingClass("/BuildConfigUtil;"::endsWith) + definingClass { endsWith("/BuildConfigUtil;") } } internal val BytecodePatchContext.isOmVerificationEnabledMethod by gettingFirstMutableMethodDeclaratively { name("isOmVerificationEnabled") - definingClass("/BuildConfigUtil;"::endsWith) + definingClass { endsWith("/BuildConfigUtil;") } } internal val BytecodePatchContext.shouldShowDebugOptionsMethod by gettingFirstMutableMethodDeclaratively { name("shouldShowDebugOptions") - definingClass("/BuildConfigUtil;"::endsWith) + definingClass { endsWith("/BuildConfigUtil;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/twitch/misc/settings/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/twitch/misc/settings/Fingerprints.kt index a2e8c0f6e..ff6ce3a1c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/twitch/misc/settings/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/twitch/misc/settings/Fingerprints.kt @@ -5,8 +5,8 @@ import app.revanced.patcher.patch.BytecodePatchContext import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.menuGroupsOnClickMethod by gettingFirstMutableMethodDeclaratively { - name("render"::contains) - definingClass("/SettingsMenuViewDelegate;"::endsWith) + name { contains("render") } + definingClass { endsWith("/SettingsMenuViewDelegate;") } accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC, AccessFlags.FINAL) returnType("V") parameterTypes("L", "L", "L") @@ -19,10 +19,10 @@ internal val BytecodePatchContext.menuGroupsUpdatedMethod by gettingFirstMutable internal val BytecodePatchContext.settingsActivityOnCreateMethod by gettingFirstMutableMethodDeclaratively { name("onCreate") - definingClass("/SettingsActivity;"::endsWith) + definingClass { endsWith("/SettingsActivity;") } } internal val BytecodePatchContext.settingsMenuItemEnumMethod by gettingFirstMutableMethodDeclaratively { name("") - definingClass("/SettingsMenuItem;"::endsWith) + definingClass { endsWith("/SettingsMenuItem;") } } diff --git a/patches/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/Fingerprints.kt index 7a0393a33..aaa775027 100644 --- a/patches/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/Fingerprints.kt @@ -7,5 +7,5 @@ import app.revanced.patcher.patch.BytecodePatchContext internal val BytecodePatchContext.promoCodeUnlockMethod by gettingFirstMutableMethodDeclaratively { name("isValid") - definingClass("PromoTokenVerification;"::endsWith) -} \ No newline at end of file + definingClass { endsWith("PromoTokenVerification;") } +} diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/Fingerprints.kt index 450bf026b..2002497b8 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/Fingerprints.kt @@ -7,7 +7,7 @@ import com.android.tools.smali.dexlib2.AccessFlags internal val BytecodePatchContext.mediaRouteButtonMethod by gettingFirstMutableMethodDeclaratively { name("setVisibility") - definingClass("/MediaRouteButton;"::endsWith) + definingClass { endsWith("/MediaRouteButton;") } parameterTypes("I") }