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 580e6e7679..332b6e4b70 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,11 +1,15 @@ package app.revanced.patches.music.misc.settings -import app.revanced.patcher.fingerprint +import app.revanced.patcher.BytecodePatchContextMethodMatching.gettingFirstMutableMethodDeclaratively +import app.revanced.patcher.definingClass +import app.revanced.patcher.name +import app.revanced.patcher.parameterTypes +import app.revanced.patcher.patch.BytecodePatchContext +import app.revanced.patcher.returnType -internal val googleApiActivityFingerprint = fingerprint { - returns("V") - parameters("Landroid/os/Bundle;") - custom { method, classDef -> - classDef.endsWith("GoogleApiActivity;") && method.name == "onCreate" - } +internal val BytecodePatchContext.googleApiActivityMethod by gettingFirstMutableMethodDeclaratively { + returnType("V") + parameterTypes("Landroid/os/Bundle;") + definingClass("GoogleApiActivity;"::endsWith) + name("onCreate") } diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt index 3a153e8b9f..c7315f5cff 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt @@ -1,6 +1,7 @@ package app.revanced.patches.music.misc.settings -import app.revanced.patcher.patch.bytecodePatch +import app.revanced.patcher.classDef +import app.revanced.patcher.patch.creatingBytecodePatch import app.revanced.patcher.patch.resourcePatch import app.revanced.patches.all.misc.packagename.setOrGetFallbackPackageName import app.revanced.patches.all.misc.resources.addResources @@ -64,8 +65,8 @@ private val settingsResourcePatch = resourcePatch { } } -val settingsPatch = bytecodePatch( - description = "Adds settings for ReVanced to YouTube Music.", +val Settings by creatingBytecodePatch( + description = "Adds settings for ReVanced to YouTube Music." ) { dependsOn( sharedExtensionPatch, @@ -100,8 +101,8 @@ val settingsPatch = bytecodePatch( ) modifyActivityForSettingsInjection( - googleApiActivityFingerprint.classDef, - googleApiActivityFingerprint.method, + googleApiActivityMethod.classDef, + googleApiActivityMethod, GOOGLE_API_ACTIVITY_HOOK_CLASS_DESCRIPTOR, true )